【需求】管道变更/单位变更

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")) && PipelineEnum.PRESSURE_PIPELINE.getCode().equals(noticeObj.get("EQU_LIST_CODE").toString())) {
+        } else if (type.equals(ApplicationFormTypeEnum.DWBG.getBusinessCode()) && !ObjectUtils.isEmpty(noticeObj.get("EQU_LIST_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

@@ -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.isEmpty(projectContraptionList)){
             throw new BadRequest("工程/装置列表为空");
         }
         registration.setNextTaskId(nextTaskId);
@@ -1407,15 +1407,15 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             return;
         }
         List<Long> registrationIdList = new ArrayList<>();
-        List<Map<String, Object>> projectContraptionList = new ArrayList<>();
+        List<String> projectContraptionIdList = new ArrayList<>();
         //根据使用登记证查询设备
         for (Object o : registrationList) {
             JSONObject parseObject = JSON.parseObject(o.toString());
             if (parseObject.containsKey("sequenceNbr") && ObjectUtils.isNotEmpty(parseObject.get("sequenceNbr")) &&
                     canConvertToLong(parseObject.get("sequenceNbr").toString())) {
                 registrationIdList.add(Long.parseLong(parseObject.get("sequenceNbr").toString()));
+                projectContraptionIdList.add(parseObject.get("sequenceNbr").toString());
             }
-            projectContraptionList.add(parseObject);
         }
         if (CollectionUtils.isEmpty(registrationIdList)) {
             return;
@@ -1423,9 +1423,12 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         List<String> records = new ArrayList<>();
         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")));
+            LambdaQueryWrapper<JgChangeRegistrationUnitEq> wrapper = new LambdaQueryWrapper<>();
+            wrapper.in(JgChangeRegistrationUnitEq::getProjectContraptionId,projectContraptionIdList)
+                    .eq(JgChangeRegistrationUnitEq::getIsDelete,false);
+            List<JgChangeRegistrationUnitEq> changeRegistrationUnitEqs = registrationUnitEqService.list(wrapper);
+            if(CollUtil.isNotEmpty(changeRegistrationUnitEqs)){
+                changeRegistrationUnitEqs.forEach(item->records.add(item.getEquId()));
             }
         }else {
             List<JSONObject> equList = registrationManageService.queryEquByCertificateSeqList(registrationIdList);