Merge remote-tracking branch 'origin/master'

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

@@ -99,8 +99,8 @@ implements ApsDetailsHazardInvestigationTasksService {
             hiddenDangerTrack.setHiddendangerleibie(info.getClassification());
             //隐患类型
             hiddenDangerTrack.setHiddendangertype(info.getType());
-            //隐患状态 默认整改中
-            hiddenDangerTrack.setHazardstate("0");
+            //隐患状态 默认待评级
+            hiddenDangerTrack.setHazardstate("6");
             //隐患名称
             hiddenDangerTrack.setHazardname(info.getName());
             //隐患描述

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

@@ -153,8 +153,8 @@ public class SaveCheckItemServiceImpl implements SaveCheckItemService {
             hiddenDangerTrack.setHiddendangerleibie(info.getClassification());
             //隐患类型
             hiddenDangerTrack.setHiddendangertype(info.getType());
-            //隐患状态 默认整改中
-            hiddenDangerTrack.setHazardstate("0");
+            //隐患状态 默认待评级
+            hiddenDangerTrack.setHazardstate("6");
             //隐患名称
             hiddenDangerTrack.setHazardname(info.getName());
             //隐患描述

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

@@ -340,4 +340,9 @@ public class HiddenDangerTrackDo extends BaseDo implements Serializable {
      * 隐患治理期限
      */
     private Date deadlineforhazardcontrol;
+
+    /**
+     * 评级
+     */
+    private String RATE;
 }