Merge branch 'develop_tzs_register' of…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java

@@ -402,6 +402,10 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                     useInfoMap.put("fullAddress", fullAddress);
                 }
                 useInfoMap.put("useinfoSeq", useInfo.getSequenceNbr());
+                if(!ValidationUtil.isEmpty(useInfo.getLongitudeLatitude())){
+                    useInfoMap.put("longitudeLatitude", JSON.parseObject(useInfo.getLongitudeLatitude()));
+                }
+
             } else {
                 useInfoMap = convertCamelToUnderscore(useInfo, null);
                 if (!ValidationUtil.isEmpty(province)) {
@@ -420,6 +424,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                     useInfoMap.put("FULLADDRESS", fullAddress);
                 }
                 useInfoMap.put("USEINFO_SEQ", useInfo.getSequenceNbr());
+                if(!ValidationUtil.isEmpty(useInfo.getLongitudeLatitude())) {
+                    useInfoMap.put("LONGITUDE_LATITUDE", JSON.parseObject(useInfo.getLongitudeLatitude()));
+                }
             }
             if (!useInfoMap.isEmpty()) {
                 Map<String, Object> filterMap = useInfoMap.entrySet()

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgScrapCancelServiceImpl.java

@@ -448,7 +448,6 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         modelDto.setNextExecuteUser(jgScrapCancelDto.getNextExecuteIds());
         TaskMessageDto taskMessageDto = new TaskMessageDto();
         BeanUtils.copyProperties(jgScrapCancelDto, taskMessageDto);
-        taskMessageDto.setNextExecuteUserIds(null);
         modelDto.setModel(taskMessageDto);
         modelDto.setPageType(this.getPageTypeForReject(operate, jgScrapCancelDto.getAuditStatus()));
         commonService.buildTaskModel(Collections.singletonList(modelDto));

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/enums/DocumentEnum.java

@@ -41,6 +41,8 @@ public enum DocumentEnum {
     AGGLRY("aqglry", "安全管理人员证"),
     ZYRYZ("zyry", "作业人员证"),
     WBHT("wbht", "维保合同"),
+    AQBHZZ("aqbhzz", "安全保护装置的型式试验证书"),
+    ZJHG("zjhg", "自检合格证明"),
     AZJY("azjy", "安装监检报告");
 
     private String code;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java

@@ -529,7 +529,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         TaskResultDTO task = new TaskResultDTO();
         task.setResultCode("approvalStatus");
         task.setTaskId(taskId);
-        task.setComment("");
+        task.setComment(params.getOrDefault("comments","").toString());
         HashMap<String, Object> map = new HashMap<>();
         map.put("approvalStatus", "0");
         task.setVariable(map);
@@ -644,8 +644,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         TaskResultDTO task = new TaskResultDTO();
         task.setResultCode("approvalStatus");
         task.setTaskId(taskId);
-        task.setComment("");
-        HashMap<String, Object> map = new HashMap<>();
+        task.setComment(params.getOrDefault("comments","").toString());        HashMap<String, Object> map = new HashMap<>();
         map.put("approvalStatus", "1");
         task.setVariable(map);
         //执行流程