feat(jg)： 压力管道后续业务

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

@@ -155,6 +155,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
             jgEnableDisable.setCreateDate(new Date());
             String submit = String.valueOf(map.get("submit"));
             String pageType = String.valueOf(map.get("formType"));
+            String equListCode = map.getString("equListCode");
             // 设备列表
             List<Map<String, Object>> equipments = (List<Map<String, Object>>) map.get("equipments");
             if (SUBMIT_TYPE_FLOW.equals(submit)) {// 校验设备不能再多个流程中
@@ -162,7 +163,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                 this.repeatUsedEquipCheck(equipments,
                         CompanyTypeEnum.INDIVIDUAL.getName().equals(company.getCompanyType()) ?
                                 company.getCompanyCode().split("_")[1] :
-                                company.getCompanyCode());
+                                company.getCompanyCode(), equListCode);
             }
             String businessCode = ObjectUtils.isEmpty(map.get("applyType")) ? String.valueOf(map.get("businessCode")) : String.valueOf(map.get("applyType"));
             // 接收机构
@@ -238,6 +239,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                 } else {
                     // 启用 选择的设备中有超过定期检验有效期的设备，下次检验日期在当前时间之前的，提示:启用的设备中存在超过定期检验有效期的设备。，不能继续下一步。
                     if (APPLY_TYPE_QY.equals(map.getString("applyType"))) {
+                        if(!EquipmentClassifityEnum.YLGD.getCode().equals(equListCode)){
                             List<String> record = equipments.stream().map(equ -> String.valueOf(equ.get("record"))).collect(Collectors.toList());
                             List<IdxBizJgInspectionDetectionInfo> inspectInfos = jgInspectionDetectionInfoService.checkInspectionInfo(record);
                             List<Date> nextInspectDates = inspectInfos.stream().map(IdxBizJgInspectionDetectionInfo::getNextInspectDate).collect(Collectors.toList());
@@ -249,6 +251,12 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                                     throw new BadRequest("启用的设备中存在超过定期检验有效期的设备");
                                 }
                             });
+                        } else {
+                            // 管道校验检验有效期逻辑 nextInspectDate
+                            equipments.forEach(equ ->{
+
+                            });
+                        }
                     }
 
                     // 启动工作流并返回信息
@@ -268,8 +276,6 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                 jgEnableDisable.setUseUnitName(reginParams.getCompany().getCompanyName());
                 jgEnableDisable.setReceiveCompanyCode(receiveOrgCode[0]);
                 jgEnableDisable.setReceiveOrgName(receiveOrgCode[1]);
-                // 设备种类
-                String equListCode = String.valueOf(map.getString("equListCode"));
                 jgEnableDisable.setEquListCode(equListCode);
                 jgEnableDisable.setEquListName(EquipmentClassifityEnum.getNameByCode(equListCode));
                 setCertInfoByEquList(map, jgEnableDisable);
@@ -333,9 +339,9 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         }
     }
 
-    private void repeatUsedEquipCheck(List<Map<String, Object>> equipList, String companyCode) {
+    private void repeatUsedEquipCheck(List<Map<String, Object>> equipList, String companyCode, String equListCode) {
         equipList.forEach(equipMap -> EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY)
-                .equipRepeatUsedCheck(String.valueOf(equipMap.get("SEQUENCE_NBR")), companyCode));
+                .equipRepeatUsedCheck(String.valueOf(equipMap.get(this.getRecordKey(equListCode))), companyCode));
     }
 
     /**
@@ -448,12 +454,15 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
     }
 
     private String getRecordKey(JgEnableDisable jgEnableDisable) {
-        if(!EquipmentClassifityEnum.YLGD.getCode().equals(jgEnableDisable.getEquListCode())) {
+        return getRecordKey(jgEnableDisable.getEquListCode());
+    }
+
+    private String getRecordKey(String equListCode) {
+        if(!EquipmentClassifityEnum.YLGD.getCode().equals(equListCode)) {
             return "SEQUENCE_NBR";
         } else {
             return "record";
         }
-
     }