Merge remote-tracking branch 'origin/V0.1.0' into V0.1.0

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppRuleItemServiceImpl.java

@@ -10,6 +10,7 @@ import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.R;
 import com.xunmei.common.core.utils.IDHelper;
 import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.resumption.domain.AppRule;
 import com.xunmei.core.resumption.domain.AppRuleItem;
 import com.xunmei.core.resumption.domain.AppRulePoint;
@@ -80,10 +81,14 @@ public class AppRuleItemServiceImpl extends ServiceImpl<AppRuleItemMapper, AppRu
             throw new RuntimeException("履职项重复");
         }
 
-        final AppRule appRule = appRuleMapper.selectById(appRuleItemDto.getRuleId());
+        AppRule appRule = appRuleMapper.selectById(appRuleItemDto.getRuleId());
         if (appRule == null) {
             throw new RuntimeException("履职手册不存在");
         }
+        //修改手册更新时间
+        appRule.setUpdateTime(new Date());
+        appRule.setUpdateBy(SecurityUtils.getUsername());
+        appRuleMapper.updateById(appRule);
 
         saveOrUpdate(item);
         final List<AppRulePointDto> pointDtoList = appRuleItemDto.getPointDtoList();
@@ -185,6 +190,17 @@ public class AppRuleItemServiceImpl extends ServiceImpl<AppRuleItemMapper, AppRu
                 throw new RuntimeException("该检查项已被履职计划关联!");
             }
         }
+        //修改手册更新时间
+        AppRuleItem appRuleItem = appRuleItemMapper.selectById(id);
+        if (null != appRuleItem){
+            AppRule appRule = appRuleMapper.selectById(appRuleItem.getId());
+            if (null != appRule){
+                appRule.setUpdateTime(new Date());
+                appRule.setUpdateBy(SecurityUtils.getUsername());
+                appRuleMapper.updateById(appRule);
+            }
+        }
+
         appRuleItemMapper.deleteById(id);
         appRulePointMapper.deleteByMap(MapUtil.of("item_id", id));
         return true;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/SafetyCheckRuleItemServiceImpl.java

@@ -10,6 +10,7 @@ import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.R;
 import com.xunmei.common.core.utils.IDHelper;
 import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.resumption.domain.AppRuleItem;
 import com.xunmei.core.resumption.dto.ruleItem.AppRuleItemDto;
 import com.xunmei.core.resumption.vo.appRuleItem.RuleTreeItem;
@@ -79,10 +80,14 @@ public class SafetyCheckRuleItemServiceImpl
 //            throw new RuntimeException("检查项编号重复");
 //        }
 
-        final SafetyCheckRule rule = safetyCheckRuleMapper.selectById(ruleItemDto.getRuleId());
+        SafetyCheckRule rule = safetyCheckRuleMapper.selectById(ruleItemDto.getRuleId());
         if (rule == null) {
             throw new RuntimeException("检查手册不存在!");
         }
+        //修改手册更新时间
+        rule.setUpdateTime(new Date());
+        rule.setUpdateBy(SecurityUtils.getUsername());
+        safetyCheckRuleMapper.updateById(rule);
 
         Integer itemNameNums = safetyCheckRuleItemMapper.checkItemNameRepeat(item.getId(), item.getRuleId(), item.getName());
         if (itemNameNums > 0) {
@@ -191,6 +196,17 @@ public class SafetyCheckRuleItemServiceImpl
 //                throw new RuntimeException("该检查项已被检查计划关联!");
 //            }
 //        }
+        //修改手册更新时间
+        SafetyCheckRuleItem ruleItem = safetyCheckRuleItemMapper.selectById(id);
+        if (null != ruleItem){
+            SafetyCheckRule rule = safetyCheckRuleMapper.selectById(ruleItem.getId());
+            if (null != rule){
+                rule.setUpdateTime(new Date());
+                rule.setUpdateBy(SecurityUtils.getUsername());
+                safetyCheckRuleMapper.updateById(rule);
+            }
+        }
+
         safetyCheckRuleItemMapper.deleteById(id);
         safetyCheckRulePointMapper.deleteByMap(MapUtil.of("item_id", id));
         return true;