feature 修改任务类型

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

@@ -104,8 +104,15 @@ public class ApsDetailsHazardInvestigationTasksServiceImpl extends ServiceImpl<A
             hiddenDangerTrack.setHiddendangerleibie(info.getClassification());
             //隐患类型
             hiddenDangerTrack.setHiddendangertype(info.getType());
-            //隐患来源
-            hiddenDangerTrack.setDangersource("1");
+            // 日常任务
+            if("0".equals(apsDetailsHazardInvestigationTasksDo.getTasktype())){
+                //隐患来源
+                hiddenDangerTrack.setDangersource("1");
+            }else{
+                //管控措施失效
+                hiddenDangerTrack.setDangersource("9");
+            }
+
             //隐患状态 默认待评级
             hiddenDangerTrack.setHazardstate("3");
             //隐患名称
@@ -117,6 +124,7 @@ public class ApsDetailsHazardInvestigationTasksServiceImpl extends ServiceImpl<A
             if (StringUtils.isNotBlank(info.getMeasure())) {
                 hiddenDangerTrack.setMeasure(info.getMeasure());
             }
+
             //整改责任人
             hiddenDangerTrack.setTrackusername(info.getTrackuser());
             //责任人 id

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

@@ -152,7 +152,7 @@ public class SaveCheckItemServiceImpl implements SaveCheckItemService {
             //隐患等级hazardlevel
             hiddenDangerTrack.setHazardlevel(info.getGrade());
             //隐患来源
-            hiddenDangerTrack.setDangersource(MlConstants.DANGER_SOURCE_THEMECHECK);
+            hiddenDangerTrack.setDangersource(checkItemDo.getChecktype());
             //治理类型
             hiddenDangerTrack.setGovernancetype(info.getGovernancetype());
             //隐患类别

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

@@ -30,7 +30,7 @@ public class ThemeCheckItemDo extends BaseDo implements Serializable {
     /**
      * 主题检查ID
      */
-    private String /**/themecheckid;
+    private String themecheckid;
     /**
      * 主题检查工段ID
      */