feature 隐患排查模板生成隐患任务代码提交

js-common/src/main/java/com/rongwei/safecommon/utils/JSCommonUtils.java

@@ -350,11 +350,13 @@ public class JSCommonUtils {
     }
     public static <T extends BaseDo> void setBaseDetail(T t, SysUserVo userVo) {
         t.setCreatedate(new Date());
-        t.setCreateuserid(userVo.getId());
-        t.setCreateusername(userVo.getName());
         t.setModifydate(new Date());
-        t.setModifyuserid(userVo.getId());
-        t.setModifyusername(userVo.getName());
+        if(userVo!=null){
+            t.setCreateuserid(userVo.getId());
+            t.setCreateusername(userVo.getName());
+            t.setModifyuserid(userVo.getId());
+            t.setModifyusername(userVo.getName());
+        }
         t.setDeleted("0");
     }
     @PostConstruct

js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/HazardInvestigationServiceImpl.java

@@ -11,7 +11,6 @@ import com.rongwei.rwcommon.utils.SecurityUtil;
 import com.rongwei.rwcommon.utils.StringUtils;
 import com.rongwei.rwcommonentity.commonservers.vo.SysSerialVo;
 import com.rongwei.safecommon.utils.JSCommonUtils;
-import com.rongwei.sfcommon.sys.dao.ApsHazardInvestigationTemplateZibiaoDao;
 import com.rongwei.sfcommon.sys.service.HazardInvestigationService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -62,11 +61,12 @@ public class HazardInvestigationServiceImpl implements HazardInvestigationServic
         // 生成隐患排查任务
         assembleTask(tempData);
 
-        return null;
+        return R.ok();
     }
 
     /**
      * 生成隐患任务信息
+     *
      * @param tempData
      */
     public void assembleTask(ApsHazardInvestigationTemplateDo tempData) {
@@ -80,31 +80,30 @@ public class HazardInvestigationServiceImpl implements HazardInvestigationServic
         List<ApsHazardInvestigationTemplateZibiaoDo> checkItemList = apsHazardInvestigationTemplateZibiaoService.list(new LambdaQueryWrapper<ApsHazardInvestigationTemplateZibiaoDo>()
                 .eq(BaseDo::getDeleted, "0")
                 .eq(ApsHazardInvestigationTemplateZibiaoDo::getMubanid, tempData.getId()));
-        if(checkItemList.isEmpty()){
-            log.error("当前模板:{}不存在检查项",tempData.getTemplatename());
+        if (checkItemList.isEmpty()) {
+            log.error("当前模板:{}不存在检查项", tempData.getTemplatename());
             throw new CustomException("当前模板不存在检查项");
         }
         // 风险点
         List<String> riskPointIds = Arrays.asList(tempData.getHiddendangerid().split(","));
         List<AspRiskUnitDo> aspRiskUnitDos = (List<AspRiskUnitDo>) aspRiskUnitService.listByIds(riskPointIds);
-        if(aspRiskUnitDos.isEmpty()){
-            log.error("无法根据id:{}找到对应的风险点",riskPointIds);
+        if (aspRiskUnitDos.isEmpty()) {
+            log.error("无法根据id:{}找到对应的风险点", riskPointIds);
             throw new CustomException("无法获取对应的风险点");
         }
-        List<ApsDetailsHazardInvestigationTasksDo> saveList= new ArrayList<>();
-        List<ApsDetailsHazardInvestigationTasksJcxzibiaoDo> subSaveList = new ArrayList<>();
+        List<ApsDetailsHazardInvestigationTasksDo> taskSaveList = new ArrayList<>();
+        List<ApsDetailsHazardInvestigationTasksJcxzibiaoDo> taskDetailSaveList = new ArrayList<>();
         // 按照风险点 分开生成隐患排查任务
         ApsDetailsHazardInvestigationTasksDo apsDetailsHazardInvestigationTasksDo;
-        ApsDetailsHazardInvestigationTasksJcxzibiaoDo apsHazardInvestigationTemplateZibiaoDo;
         for (AspRiskUnitDo s : aspRiskUnitDos) {
             apsDetailsHazardInvestigationTasksDo = new ApsDetailsHazardInvestigationTasksDo();
-            JSCommonUtils.setBaseDetail(apsDetailsHazardInvestigationTasksDo,currentUser);
+            JSCommonUtils.setBaseDetail(apsDetailsHazardInvestigationTasksDo, currentUser);
             apsDetailsHazardInvestigationTasksDo.setId(SecurityUtil.getUUID());
             apsDetailsHazardInvestigationTasksDo.setRiskunit(tempData.getHiddendangerid());
             apsDetailsHazardInvestigationTasksDo.setRiskanalysisobjectcode(tempData.getHiddendanger());
             SysSerialVo sysSerialVo = new SysSerialVo();
-            sysSerialVo.setModulecode("aps_hazard_investigation_template_TEMPLATENUMBER");
-            sysSerialVo.setRuleTemplateStr("BIANHAO@{serialNumber:#000000}");
+            sysSerialVo.setModulecode("aps_details_hazard_investigation_tasks_NUMBER");
+            sysSerialVo.setRuleTemplateStr("YH@{date:yyyyMMdd}@{serialNumber:#000000}");
             sysSerialVo.setIfautomaticreset("n");
             apsDetailsHazardInvestigationTasksDo.setNumber(autoSysSerialNumberService.getCodeByTemplate(sysSerialVo));
             apsDetailsHazardInvestigationTasksDo.setIdentifyperple(s.getDutyofficername());
@@ -123,32 +122,45 @@ public class HazardInvestigationServiceImpl implements HazardInvestigationServic
             startOfDay.set(Calendar.SECOND, 59);
             startOfDay.set(Calendar.MILLISECOND, 999);
             apsDetailsHazardInvestigationTasksDo.setPlannedendtime(startOfDay.getTime());
-            saveList.add(apsDetailsHazardInvestigationTasksDo);
-
+            taskSaveList.add(apsDetailsHazardInvestigationTasksDo);
+            taskDetailSaveList.addAll(assembleTaskDetails(currentUser,apsDetailsHazardInvestigationTasksDo, checkItemList));
         }
-        apsDetailsHazardInvestigationTasksServiceImpl.saveBatch(saveList);
-
+        apsDetailsHazardInvestigationTasksServiceImpl.saveBatch(taskSaveList);
+        apsDetailsHazardInvestigationTasksJcxzibiaoService.saveBatch(taskDetailSaveList);
     }
 
     /**
      * 生成隐患任务详情
+     *
+     * @return
      */
-    public void assembleTaskDetails(SysUserVo currentUser,
-                                    ApsDetailsHazardInvestigationTasksDo apsDetailsHazardInvestigationTasksDo,
-                                    List<ApsHazardInvestigationTemplateZibiaoDo> checkItemList ){
+    public List<ApsDetailsHazardInvestigationTasksJcxzibiaoDo> assembleTaskDetails(SysUserVo currentUser,
+                                                                                   ApsDetailsHazardInvestigationTasksDo apsDetailsHazardInvestigationTasksDo,
+                                                                                   List<ApsHazardInvestigationTemplateZibiaoDo> checkItemList) {
         ApsDetailsHazardInvestigationTasksJcxzibiaoDo apsHazardInvestigationTemplateZibiaoDo;
+        List<ApsDetailsHazardInvestigationTasksJcxzibiaoDo> subSaveList = new ArrayList<>();
         for (ApsHazardInvestigationTemplateZibiaoDo s : checkItemList) {
             apsHazardInvestigationTemplateZibiaoDo = new ApsDetailsHazardInvestigationTasksJcxzibiaoDo();
             apsHazardInvestigationTemplateZibiaoDo.setId(SecurityUtil.getUUID());
             apsHazardInvestigationTemplateZibiaoDo.setTaskid(apsDetailsHazardInvestigationTasksDo.getId());
-            JSCommonUtils.setBaseDetail(apsHazardInvestigationTemplateZibiaoDo,currentUser);
+            JSCommonUtils.setBaseDetail(apsHazardInvestigationTemplateZibiaoDo, currentUser);
             apsHazardInvestigationTemplateZibiaoDo.setControlmeasurenumber(s.getControlmeasurenumber());
             apsHazardInvestigationTemplateZibiaoDo.setInspectioncycle(s.getInspectioncycle());
             apsHazardInvestigationTemplateZibiaoDo.setInspectioncycleunit(s.getInspectioncycleunit());
             apsHazardInvestigationTemplateZibiaoDo.setTasktype(s.getTasktype());
-
+            apsHazardInvestigationTemplateZibiaoDo.setWorkingdaytype(s.getWorkingdaytype());
+            apsHazardInvestigationTemplateZibiaoDo.setCorrespondingitemsforwarrantytasks(s.getCorrespondingitemsforwarrantytasks());
+            apsHazardInvestigationTemplateZibiaoDo.setHiddendangerinvestigationcontent(s.getHiddendangerinvestigationcontent());
+            apsHazardInvestigationTemplateZibiaoDo.setRiskevent(s.getRiskevent());
+            apsHazardInvestigationTemplateZibiaoDo.setRiskunit(s.getRiskunit());
+            apsHazardInvestigationTemplateZibiaoDo.setControlmethod(s.getControlmethod());
+            apsHazardInvestigationTemplateZibiaoDo.setClassificationofcontrolmeasures1(s.getClassificationofcontrolmeasures1());
+            apsHazardInvestigationTemplateZibiaoDo.setClassificationofcontrolmeasures2(s.getClassificationofcontrolmeasures2());
+            apsHazardInvestigationTemplateZibiaoDo.setDescriptionofcontrolmeasures(s.getDescriptionofcontrolmeasures());
+            apsHazardInvestigationTemplateZibiaoDo.setClassificationofcontrolmeasures3(s.getClassificationofcontrolmeasures3());
+            subSaveList.add(apsHazardInvestigationTemplateZibiaoDo);
         }
-
+        return subSaveList;
     }
 
 }

js-security/security-entity/src/main/java/com/rongwe/scentity/domian/ApsDetailsHazardInvestigationTasksJcxzibiaoDo.java

@@ -122,6 +122,7 @@ public class ApsDetailsHazardInvestigationTasksJcxzibiaoDo extends BaseDo implem
     /**
      * 巡检人
      */
+    @Deprecated
     private String inspector;
 
     /**

js-training/training-common/training-common.iml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="AdditionalModuleElements">
+    <content url="file://$MODULE_DIR$" dumb="true">
+      <excludeFolder url="file://$MODULE_DIR$/src/main/java/com/rongwei/trainingcommon/sys/utils/functionInterface/Utils" />
+    </content>
+  </component>
+</module>