管道变更/单位变更

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

@@ -1295,7 +1295,7 @@ public class CommonServiceImpl implements ICommonService {
             noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
             JSONObject jsonObject = new JSONObject(noticeObj);
             return jgChangeVehicleRegistrationUnitService.saveMessage(jsonObject, reginParams);
-        } else if (type.equals(ApplicationFormTypeEnum.DWBG.getBusinessCode()) && !ObjectUtils.isEmpty(noticeObj.get("EQU_CATEGORY_CODE")) && "8300".equals(noticeObj.get("EQU_CATEGORY_CODE").toString())) {
+        } else if (type.equals(ApplicationFormTypeEnum.DWBG.getBusinessCode()) && !ObjectUtils.isEmpty(noticeObj.get("EQU_CATEGORY_CODE")) && PipelineEnum.PRESSURE_PIPELINE.getCode().equals(noticeObj.get("EQU_LIST_CODE").toString())) {
             noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
             provideMap.put(DWBG_PAGE_ID, noticeObj);
             JSONObject jsonObject = new JSONObject(provideMap);

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

@@ -221,7 +221,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 new LambdaQueryWrapper<JgRegistrationHistory>()
                         .eq(JgRegistrationHistory::getCurrentDocumentId, notice.getApplyNo())
                         .eq(JgRegistrationHistory::getIsDelete, false));
-        if("8000".equals(notice.getEquListCode())){
+        if(PipelineEnum.PRESSURE_PIPELINE.getCode().equals(notice.getEquListCode())){
             changeInfo.put("projectContraptionList", JSON.parse(historyServiceOne.getChangeData()));
         } else {
             changeInfo.put("registrationList", JSON.parse(historyServiceOne.getChangeData()));
@@ -1153,7 +1153,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                     registration.setStatus(taskName[0]);
                     registration.setAuditPassDate(new Date());
                     //如果是工业管道 如果工程装置对应一个证就直接变更给新单位；如果工程装置对应证下还有其他装置就变更后直接给新单位再重新生成一个登记证号；如果两个工程装置对应同一个使用登记证变更后生成两个新的登记证
-                    if ("8300".equals(dto.getEquCategory())){
+                    if (PipelineEnum.PRESSURE_PIPELINE.getCode().equals(dto.getEquListCode())){
                         dealProjectContraption(dto,nextTaskId,registration,op);
                     }else {
                         // 生成新的使用登记编号，使用登记证  修改设备的使用登记信息表，使用单位名称，使用单位统一信用代码，使用登记证编号，更新ES
@@ -1260,7 +1260,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
      */
     private void dealProjectContraption(JgChangeRegistrationUnitDto dto, String nextTaskId, JgChangeRegistrationUnit registration,String op) {
         List<Map<String, Object>> projectContraptionList = dto.getProjectContraptionList();
-        if(CollUtil.isNotEmpty(projectContraptionList)){
+        if(!CollUtil.isNotEmpty(projectContraptionList)){
             throw new BadRequest("工程/装置列表为空");
         }
         registration.setNextTaskId(nextTaskId);
@@ -1407,6 +1407,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             return;
         }
         List<Long> registrationIdList = new ArrayList<>();
+        List<Map<String, Object>> projectContraptionList = new ArrayList<>();
         //根据使用登记证查询设备
         for (Object o : registrationList) {
             JSONObject parseObject = JSON.parseObject(o.toString());
@@ -1414,18 +1415,28 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                     canConvertToLong(parseObject.get("sequenceNbr").toString())) {
                 registrationIdList.add(Long.parseLong(parseObject.get("sequenceNbr").toString()));
             }
+            projectContraptionList.add(parseObject);
         }
         if (CollectionUtils.isEmpty(registrationIdList)) {
             return;
         }
-        List<JSONObject> equList = registrationManageService.queryEquByCertificateSeqList(registrationIdList);
-        // 获取单位变更设备列表
-        if (CollectionUtils.isEmpty(equList)) {
-            return;
-        }
         List<String> records = new ArrayList<>();
-        for (JSONObject jsonObject : equList) {
-            records.add(jsonObject.getString("SEQUENCE_NBR"));
+        String equListCode = JSON.parseObject(registrationList.get(0).toString()).getString("equList");
+        if (PipelineEnum.PRESSURE_PIPELINE.getCode().equals(equListCode)) {
+            List<Map<String, Object>> maps = queryPipelineList(projectContraptionList);
+            if(CollUtil.isNotEmpty(maps)){
+                maps.forEach(item->records.add((String) item.get("record")));
+            }
+        }else {
+            List<JSONObject> equList = registrationManageService.queryEquByCertificateSeqList(registrationIdList);
+            // 获取单位变更设备列表
+            if (CollectionUtils.isEmpty(equList)) {
+                return;
+            }
+
+            for (JSONObject jsonObject : equList) {
+                records.add(jsonObject.getString("SEQUENCE_NBR"));
+            }
         }
         if (NOT_FLOWING_STATE.contains(status)) {
             EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY)