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

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgChangeRegistrationUnitController.java

@@ -130,8 +130,9 @@ public class JgChangeRegistrationUnitController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/projectContraption/details")
     @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个管道工程装置表", notes = "根据sequenceNbr查询单个管道工程装置表")
-    public ResponseModel<Map<String, Map<String, Object>>> detailsByProjectContraption(@RequestParam("sequenceNbr") String sequenceNbr) {
-        return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.detailsByProjectContraption(sequenceNbr));
+    public ResponseModel<Map<String, Map<String, Object>>> detailsByProjectContraption(@RequestParam("sequenceNbr") String sequenceNbr,
+                                                                                       @RequestParam("applyNo")String applyNo) {
+        return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.detailsByProjectContraption(sequenceNbr,applyNo));
     }
 
     /**

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

@@ -226,7 +226,15 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                         .eq(JgRegistrationHistory::getCurrentDocumentId, notice.getApplyNo())
                         .eq(JgRegistrationHistory::getIsDelete, false));
         if(PipelineEnum.PRESSURE_PIPELINE.getCode().equals(notice.getEquListCode())){
-            changeInfo.put("projectContraptionList", JSON.parse(historyServiceOne.getChangeData()));
+            //添加申请编号
+            JSONArray jsonArray = JSON.parseArray(historyServiceOne.getChangeData());
+            if (!CollectionUtils.isEmpty(jsonArray)) {
+                for (int i = 0; i < jsonArray.size(); i++) {
+                    JSONObject jsonObject = jsonArray.getJSONObject(i); // 直接获取 JSONObject
+                    jsonObject.put("applyNo", notice.getApplyNo());
+                }
+                changeInfo.put("projectContraptionList", jsonArray);
+            }
         } else {
             changeInfo.put("registrationList", JSON.parse(historyServiceOne.getChangeData()));
         }
@@ -1317,7 +1325,9 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 IdxBizJgProjectContraption idxBizJgProjectContraption =  projectContraptionService.getBaseMapper().selectById(Long.valueOf(sequenceNbr));
                 //查询使用登记表eq 查询和装置关联的管道，取第一个用于生成登记编号
                 LambdaQueryWrapper<JgChangeRegistrationUnitEq> registrationUnitEqWrapper = new LambdaQueryWrapper<>();
-                registrationUnitEqWrapper.eq(JgChangeRegistrationUnitEq::getProjectContraptionId,idxBizJgProjectContraption.getSequenceNbr());
+                registrationUnitEqWrapper.eq(JgChangeRegistrationUnitEq::getProjectContraptionId,idxBizJgProjectContraption.getSequenceNbr())
+                        .eq(JgChangeRegistrationUnitEq::getUnitChangeRegistrationId,registration.getSequenceNbr())
+                        .eq(JgChangeRegistrationUnitEq::getIsDelete,false);
                 List<JgChangeRegistrationUnitEq> changeRegistrationUnitEqs = registrationUnitEqService.list(registrationUnitEqWrapper);
                 if(CollUtil.isEmpty(changeRegistrationUnitEqs)){
                     throw new BadRequest("使用登记表没有找到工程/装置对应的信息");
@@ -1373,12 +1383,13 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
      * 更新关系表
      * @param sequenceNbr
      * @param registration
-     * @param flag
+     * @param isNewUseOrgCode
      * @param useOrgCode
      */
-    private void updateRelationTable(Long sequenceNbr, JgChangeRegistrationUnit registration, Boolean flag,String useOrgCode) {
+    private void updateRelationTable(Long sequenceNbr, JgChangeRegistrationUnit registration, Boolean isNewUseOrgCode,String useOrgCode) {
         LambdaQueryWrapper<JgChangeRegistrationUnitEq> unitEqWrapper = new LambdaQueryWrapper<>();
         unitEqWrapper.eq(JgChangeRegistrationUnitEq::getProjectContraptionId,sequenceNbr)
+                .eq(JgChangeRegistrationUnitEq::getUnitChangeRegistrationId,registration.getSequenceNbr())
                 .eq(JgChangeRegistrationUnitEq::getIsDelete,false);
         List<JgChangeRegistrationUnitEq> changeRegistrationUnitEqs = registrationUnitEqService.list();
         if(!CollectionUtils.isEmpty(changeRegistrationUnitEqs)){
@@ -1403,7 +1414,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                     map1.put("USE_UNIT_CREDIT_CODE", companyCode.length > 1 ? companyCode[1] : registration.getNewUseUnitCreditCode());
                     map1.put("USE_UNIT_NAME", registration.getNewUseUnitName());
                     map1.put("REC_DATE", new Date());// 更新时间
-                    if(Boolean.TRUE.equals(flag)){
+                    if(Boolean.TRUE.equals(isNewUseOrgCode)){
                         map1.put("USE_ORG_CODE", useOrgCode);
                     }
                     resultMap.put(equipId, map1);
@@ -1480,13 +1491,19 @@ 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)) {
+            JgChangeRegistrationUnit registrationUnit = this.lambdaQuery().eq(JgChangeRegistrationUnit::getApplyNo, applyNo)
+                    .eq(JgChangeRegistrationUnit::getIsDelete, false)
+                    .one();
+            if(Objects.nonNull(registrationUnit)){
                 LambdaQueryWrapper<JgChangeRegistrationUnitEq> wrapper = new LambdaQueryWrapper<>();
                 wrapper.in(JgChangeRegistrationUnitEq::getProjectContraptionId,projectContraptionIdList)
+                        .eq(JgChangeRegistrationUnitEq::getUnitChangeRegistrationId,registrationUnit.getSequenceNbr())
                         .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);
             // 获取单位变更设备列表
@@ -2187,7 +2204,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         return result;
     }
 
-    public Map<String, Map<String, Object>> detailsByProjectContraption(String sequenceNbr) {
+    public Map<String, Map<String, Object>> detailsByProjectContraption(String sequenceNbr,String applyNo) {
         String[] jsonFields = {"productPhoto", "otherAccessories", "productQualificationCertificate", "startLatitudeLongitude",
                 "endLatitudeLongitude"};
         Map<String, Map<String, Object>> resultMap = new HashMap<>();
@@ -2195,9 +2212,17 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             resultMap.put("equipInfo", Collections.emptyMap());
             return resultMap;
         }
+        JgChangeRegistrationUnit registrationUnit = this.lambdaQuery().eq(JgChangeRegistrationUnit::getApplyNo, applyNo)
+                .eq(JgChangeRegistrationUnit::getIsDelete, false)
+                .one();
+        if(Objects.isNull(registrationUnit)){
+            resultMap.put("equipInfo", Collections.emptyMap());
+            return resultMap;
+        }
         //如果单位变更关系表没有管道数据返回空
         LambdaQueryWrapper<JgChangeRegistrationUnitEq> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(JgChangeRegistrationUnitEq::getProjectContraptionId,sequenceNbr)
+                .eq(JgChangeRegistrationUnitEq::getUnitChangeRegistrationId,registrationUnit.getSequenceNbr())
                 .eq(JgChangeRegistrationUnitEq::getIsDelete,false);
         List<JgChangeRegistrationUnitEq> changeRegistrationUnitEqs = registrationUnitEqService.list(wrapper);
         if(CollUtil.isEmpty(changeRegistrationUnitEqs)){