feature 修改整改人

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

@@ -118,7 +118,7 @@ public class ApsDetailsHazardInvestigationTasksServiceImpl extends ServiceImpl<A
                 hiddenDangerTrack.setMeasure(info.getMeasure());
             }
             //整改责任人
-            hiddenDangerTrack.setResponsiblepersonforrectification(info.getTrackuser());
+            hiddenDangerTrack.setTrackusername(info.getTrackuser());
             //责任人 id
             hiddenDangerTrack.setTrackuserid(info.getTrackuserid());
             //检查任务id

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

@@ -168,7 +168,7 @@ public class SaveCheckItemServiceImpl implements SaveCheckItemService {
                 hiddenDangerTrack.setHazarddescription(info.getHazarddescription());
             }
             //整改责任人
-            hiddenDangerTrack.setResponsiblepersonforrectification(info.getTrackuser());
+            hiddenDangerTrack.setTrackusername(info.getTrackuser());
             //责任人 id
             hiddenDangerTrack.setTrackuserid(info.getTrackuserid());
             //检查任务id

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

@@ -71,7 +71,7 @@ public class SpecialInspectionServiceImpl implements SpecialInspectionService {
             hiddenDangerTrackDo.setHazardname(checkDiscoveryItemDo.getName());
             hiddenDangerTrackDo.setHazarddescription(checkDiscoveryItemDo.getHazarddescription());
             hiddenDangerTrackDo.setHazardphoto(checkDiscoveryItemDo.getFileinfo());
-            hiddenDangerTrackDo.setResponsiblepersonforrectification(checkDiscoveryItemDo.getTrackuser());
+            hiddenDangerTrackDo.setTrackusername(checkDiscoveryItemDo.getTrackuser());
             hiddenDangerTrackDo.setTrackuserid(checkDiscoveryItemDo.getTrackuserid());
             hiddenDangerTrackDo.setTenantid(specialInspectionTaskDo.getTenantid());
             JSCommonUtils.setBaseDetail(hiddenDangerTrackDo,currentUser);

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

@@ -1154,7 +1154,7 @@ public class SynchronizationServiceImpl implements SynchronizationService {
         dataCheck(errorMsgList, doItem.getCauseanalysis(), "原因分析为空", syncDataMap, "DANGER_REASON", null);
         dataCheck(errorMsgList, doItem.getMeasure(), "控制措施为空", syncDataMap, "CONTROL_MEASURES", null);
         dataCheck(errorMsgList, doItem.getRectificationfund(), "整改资金为空", syncDataMap, "COST", null);
-        dataCheck(errorMsgList, doItem.getResponsiblepersonforrectification(), "整改责任人为空", syncDataMap, "LIABLE_PERSON", null);
+        dataCheck(errorMsgList, doItem.getTrackusername(), "整改责任人为空", syncDataMap, "LIABLE_PERSON", null);
         dataCheck(errorMsgList, doItem.getDeadlineforhazardcontrol(), "隐患治理期限为空", syncDataMap, "DANGER_MANAGE_DEADLINE", null);
         dataCheck(errorMsgList, doItem.getShopfacilitator(), "验收人姓名为空", syncDataMap, "CHECK_ACCEPT_PERSON", null);
         dataCheck(errorMsgList, doItem.getAcceptancetime(), "验收时间为空", syncDataMap, "CHECK_ACCEPT_TIME", new SimpleDateFormat("yyyyMMddHHmmss"));
@@ -1556,7 +1556,7 @@ public class SynchronizationServiceImpl implements SynchronizationService {
                 .filter(hiddenDangerTrackMapDo -> hiddenDangerTrackMapDo.getHiddendangerleibie() != null && !hiddenDangerTrackMapDo.getHiddendangerleibie().isEmpty())
                 .filter(hiddenDangerTrackMapDo -> hiddenDangerTrackMapDo.getHiddendangertype() != null && !hiddenDangerTrackMapDo.getHiddendangertype().isEmpty())
                 .filter(hiddenDangerTrackMapDo -> hiddenDangerTrackMapDo.getHazarddescription() != null && !hiddenDangerTrackMapDo.getHazarddescription().isEmpty())
-                .filter(hiddenDangerTrackMapDo -> hiddenDangerTrackMapDo.getResponsiblepersonforrectification() != null && !hiddenDangerTrackMapDo.getResponsiblepersonforrectification().isEmpty())
+                .filter(hiddenDangerTrackMapDo -> hiddenDangerTrackMapDo.getTrackusername() != null && !hiddenDangerTrackMapDo.getTrackusername().isEmpty())
                 .filter(hiddenDangerTrackMapDo -> hiddenDangerTrackMapDo.getDeadlineforhazardcontrol() != null)
                 .filter(hiddenDangerTrackMapDo -> hiddenDangerTrackMapDo.getShopfacilitator() != null && !hiddenDangerTrackMapDo.getShopfacilitator().isEmpty())
                 .filter(hiddenDangerTrackMapDo -> hiddenDangerTrackMapDo.getAcceptancetime() != null)

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

@@ -313,6 +313,7 @@ public class HiddenDangerTrackDo extends BaseDo implements Serializable {
     /**
      * 整改责任人
      */
+    @Deprecated
     private String responsiblepersonforrectification;
     /**
      * 整改责任人id