fix(jg):超设计使用年限功能开发

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/BusinessTypeEnum.java

@@ -52,7 +52,7 @@ public enum BusinessTypeEnum {
 
     JG_HISTORY_USAGE_REGISTRATION("119", "历史设备登记"),
 
-    JG_OVER_DESIGN_SERVICE_LIFE("120", "超设计使用年限登记"),
+    JG_OVER_DESIGN_SERVICE_LIFE("120", "超设计使用年限变更"),
 
     JG_REPLACEMENT_REGISTRATION("121", "补证登记");
     private final String code;

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/JgOverDesignServiceLifeServiceImpl.java

@@ -141,7 +141,7 @@ public class JgOverDesignServiceLifeServiceImpl extends BaseService<JgOverDesign
                 throw new BadRequest("请选择设备信息!");
             }
             if (SUBMIT_TYPE_FLOW.equals(map.get("submit"))) {
-                this.repeatUsedEquipCheck(equipmentLists,
+                 this.repeatUsedEquipCheck(equipmentLists,
                         CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ? company.getCompanyCode().split("_")[1] : company.getCompanyCode());
             }
             List<IdxBizJgInspectionDetectionInfo> inspectionDetectionInfoList = idxBizJgInspectionDetectionInfoService.checkInspectionInfo(
@@ -187,7 +187,7 @@ public class JgOverDesignServiceLifeServiceImpl extends BaseService<JgOverDesign
             if (hasId) {
                 ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.CSJ.getCode(), 1);
                 if (!ObjectUtils.isEmpty(listResponseModel) && listResponseModel.getStatus() != HttpStatus.OK.value()) {
-                    throw new BadRequest("超设计使用年限登记申请单单号获取失败！");
+                    throw new BadRequest("超设计使用年限变更申请单单号获取失败！");
                 }
                 String applyNo = listResponseModel.getResult().get(0);
                 overDesignServiceLife.setApplyNo(applyNo);
@@ -206,14 +206,13 @@ public class JgOverDesignServiceLifeServiceImpl extends BaseService<JgOverDesign
                     equip.setEquId(String.valueOf(device.get("record")));
                     equip.setOverDesignId(Objects.toString(overDesignServiceLife.getSequenceNbr()));
                     equip.setDeviceInfo(JSONObject.toJSONString(device));
-                    equip.setUseRegistrationCode(Objects.toString(device.get("USE_ORG_CODE")));
-                    equip.setEquList(Objects.toString(device.get("EQU_LIST_CODE")));
-                    equip.setEquCategory(Objects.toString(device.get("EQU_CATEGORY_CODE")));
-                    equip.setEquDefine(Objects.toString(device.get("EQU_DEFINE_CODE")));
+                    equip.setUseRegistrationCode(Objects.toString(device.get("USE_ORG_CODE"),""));
+                    equip.setEquList(Objects.toString(device.get("EQU_LIST_CODE"),""));
+                    equip.setEquCategory(Objects.toString(device.get("EQU_CATEGORY_CODE"),""));
+                    equip.setEquDefine(Objects.toString(device.get("EQU_DEFINE_CODE"),""));
                     if (!ObjectUtils.isEmpty(device.get("SAFETY_ASSESSMENT_REPORT"))) {
                         equip.setSafetyAssessmentReport(JSONObject.toJSONString(device.get("SAFETY_ASSESSMENT_REPORT")));
                     }
-                    equip.setEquCategory(Objects.toString(device.get("EQU_CATEGORY_CODE")));
                     equipList.add(equip);
                 });
                 jgOverDesignServiceLifeEqService.saveBatch(equipList);
@@ -250,7 +249,7 @@ public class JgOverDesignServiceLifeServiceImpl extends BaseService<JgOverDesign
                     BeanUtil.copyProperties(overDesignServiceLife, taskMessageDto);
                     taskMessageDto.setEquipId(String.valueOf(map.get("equipId")));
                     dto.setModel(taskMessageDto);
-                    dto.setTaskContent("来自超设计使用年限登记业务办理," + "【申请单号：" + overDesignServiceLife.getApplyNo() + "】");
+                    dto.setTaskContent("来自超设计使用年限变更业务办理," + "【申请单号：" + overDesignServiceLife.getApplyNo() + "】");
                     dto.setTaskCode(overDesignServiceLife.getApplyNo());
                     dto.setTaskType(String.valueOf(BusinessTypeEnum.JG_OVER_DESIGN_SERVICE_LIFE.getCode()));
                     dto.setRelationId(String.valueOf(overDesignServiceLife.getSequenceNbr()));
@@ -590,7 +589,7 @@ public class JgOverDesignServiceLifeServiceImpl extends BaseService<JgOverDesign
         dto.setTaskType(String.valueOf(BusinessTypeEnum.JG_OVER_DESIGN_SERVICE_LIFE.getCode()));
         dto.setTaskTypeLabel(BusinessTypeEnum.JG_OVER_DESIGN_SERVICE_LIFE.getName());
         dto.setFlowCreateDate(jgOverDesignServiceLife.getCreateDate());
-        dto.setTaskName(workflowResultDto.getNextTaskName());//
+        dto.setTaskName(workflowResultDto.getNextTaskName());
         dto.setTaskCode(workflowResultDto.getNextTaskCode());
         dto.setRelationId(workflowResultDto.getInstanceId());
         dto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
@@ -609,7 +608,7 @@ public class JgOverDesignServiceLifeServiceImpl extends BaseService<JgOverDesign
         BeanUtil.copyProperties(jgOverDesignServiceLife, taskMessageDto);
         dto.setModel(taskMessageDto);
         dto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
-        dto.setTaskContent("来自超设计使用年限【" + jgOverDesignServiceLife.getApplyNo() + "】的登记业务办理," + "【申请单号：" + jgOverDesignServiceLife.getApplyNo() + "】");
+        dto.setTaskContent("来自超设计使用年限变更业务办理," + "【申请单号：" + jgOverDesignServiceLife.getApplyNo() + "】");
         dto.setFlowCode(jgOverDesignServiceLife.getNextTaskId());
         list.add(dto);
         commonService.buildTaskModel(list);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/urlInfo.json

@@ -288,11 +288,11 @@
     "url": "/mixuap?appId=1742358052905971713&id=1770004751216308226&roleIds={roleIds}&userId={userId}&pageType=look"
   },
   {
-  "type": "119",
-  "pageType": "draft",
-  "name": "车用气瓶变更登记",
-  "url": "/mixuap?appId=1742358052905971713&id=1811028265452728322&roleIds={roleIds}&userId={userId}&pageType=edit"
-},
+    "type": "119",
+    "pageType": "draft",
+    "name": "车用气瓶变更登记",
+    "url": "/mixuap?appId=1742358052905971713&id=1811028265452728322&roleIds={roleIds}&userId={userId}&pageType=edit"
+  },
   {
     "type": "119",
     "pageType": "edit",
@@ -304,5 +304,23 @@
     "pageType": "look",
     "name": "车用气瓶变更登记",
     "url": "/mixuap?appId=1742358052905971713&id=1811028630713692161&roleIds={roleIds}&userId={userId}&pageType=look"
+  },
+  {
+    "type": "120",
+    "pageType": "draft",
+    "name": "超设计使用年限变更",
+    "url": "/mixuap?appId=1742358052905971713&id=1897575279816110081&roleIds={roleIds}&userId={userId}&pageType=edit"
+  },
+  {
+    "type": "120",
+    "pageType": "edit",
+    "name": "超设计使用年限变更",
+    "url": "/mixuap?appId=1742358052905971713&id=1897575052807794690&roleIds={roleIds}&userId={userId}&pageType=edit"
+  },
+  {
+    "type": "120",
+    "pageType": "look",
+    "name": "超设计使用年限变更",
+    "url": "/mixuap?appId=1742358052905971713&id=1897575052807794690&roleIds={roleIds}&userId={userId}&pageType=look"
   }
 ]
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgDesignInfo.java

@@ -119,7 +119,7 @@ public class IdxBizJgDesignInfo extends TzsBaseEntity {
     private String delayServiceLifeDate;
 
     /**
-     * 超设计使用登记次数(默认0，最多2次)
+     * 超设计使用变更登记次数(默认0，最多2次)
      */
     @TableField("\"OVER_DESIGN_REG_NUM\"")
     private String overDesignRegNum;