Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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

@@ -1174,12 +1174,12 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                             .filter(x -> "8300".equals(x.getDictDataKey()))
                             .collect(Collectors.toList());
                 }
-            }
                 if (EquipmentClassifityEnum.YLGD.getCode().equals(equList)) {
                     return this.baseMapper.queryAllEquCategoriesUnderTheEquList(equList).stream()
-                        .sorted(Comparator.comparing(DictionarieValueModel::getDictDataKey, Comparator.reverseOrder()))
+                            .filter(x -> !"8300".equals(x.getDictDataKey()))
                             .collect(Collectors.toList());
                 }
+            }
             return this.baseMapper.queryAllEquCategoriesUnderTheEquList(equList);
         }
 

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

@@ -959,9 +959,9 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
                     equList.forEach(info -> {
                         JSONObject equInfo = JSONObject.parseObject(info.toString());
                         JgCertificateChangeRecordEq jgCertificateChangeRecordEq = new JgCertificateChangeRecordEq();
-                        jgCertificateChangeRecordEq.setEquId(equInfo.get("SEQUENCE_NBR").toString());
+                        jgCertificateChangeRecordEq.setEquId(Objects.isNull(equInfo.get("SEQUENCE_NBR"))? null : equInfo.get("SEQUENCE_NBR").toString());
                         jgCertificateChangeRecordEq.setChangeRecordId(jgCertificateChangeRecord.getSequenceNbr().toString());
-                        jgCertificateChangeRecordEq.setProductCode(equInfo.get("FACTORY_NUM").toString());
+                        jgCertificateChangeRecordEq.setProductCode(Objects.isNull(equInfo.get("FACTORY_NUM"))? null : equInfo.get("FACTORY_NUM").toString());
                         jgCertificateChangeRecordEqs.add(jgCertificateChangeRecordEq);
                     });
                 }

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()));
         }
@@ -1310,11 +1318,16 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 useRegistrationManageService.updateById(registrationManage);
                 //新增使用登记证和设备变更记录
                 this.saveRecordByProjectContraption(registrationManage,registration);
+
+                //通过装置Id查询出设备进行更新 更新其他关联表
+                this.updateRelationTable(idxBizJgProjectContraption.getSequenceNbr(),registration,Boolean.FALSE,null);
             } else {
                 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("使用登记表没有找到工程/装置对应的信息");
@@ -1359,9 +1372,58 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 projectContraptionService.updateById(idxBizJgProjectContraption);
                 //新增使用登记证和设备变更记录
                 this.saveRecordByProjectContraption(registrationManage,registration);
+                //通过装置Id查询出设备进行更新 更新其他关联表
+                this.updateRelationTable(idxBizJgProjectContraption.getSequenceNbr(),registration,Boolean.TRUE,code);
+            }
         }
+
     }
 
+    /**
+     * 更新关系表
+     * @param sequenceNbr
+     * @param registration
+     * @param isNewUseOrgCode
+     * @param 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)){
+            for (JgChangeRegistrationUnitEq jgChangeRegistrationUnitEq : changeRegistrationUnitEqs) {
+                String equipId = jgChangeRegistrationUnitEq.getEquId();
+                LambdaQueryWrapper<OtherInfo> queryWrapper1 = new LambdaQueryWrapper<>();
+                queryWrapper1.eq(OtherInfo::getRecord, equipId);
+                OtherInfo tzsJgOtherInfo = tzsJgOtherInfoMapper.selectOne(queryWrapper1);
+                if (ObjectUtils.isNotEmpty(tzsJgOtherInfo)) {
+                    LambdaQueryWrapper<UseInfo> queryWrapper2 = new LambdaQueryWrapper<>();
+                    queryWrapper2.eq(UseInfo::getRecord, equipId);
+                    UseInfo useInfo = useInfoMapper.selectOne(queryWrapper2);
+                    if (ObjectUtils.isNotEmpty(useInfo)) {
+                        useInfo.setUseUnitName(registration.getNewUseUnitName());
+                        useInfo.setUseUnitCreditCode(registration.getNewUseUnitCreditCode());
+                        useInfoMapper.updateById(useInfo);
+                    }
+                    //修改ES中使用单位信息和使用单位代码
+                    Map<String, Map<String, Object>> resultMap = new HashMap<>();
+                    Map<String, Object> map1 = new HashMap<>();
+                    String[] companyCode = registration.getNewUseUnitCreditCode().split("_");
+                    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(isNewUseOrgCode)){
+                        map1.put("USE_ORG_CODE", useOrgCode);
+                    }
+                    resultMap.put(equipId, map1);
+                    tzsServiceFeignClient.commonUpdateEsDataByIds(resultMap);
+                    //修改各类告知列表，置为废弃
+                    this.updataInvalidStatusByHistory(equipId, registration.getApplyNo());
+                }
+            }
+        }
     }
 
     /**
@@ -1429,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);
             // 获取单位变更设备列表
@@ -2136,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<>();
@@ -2144,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)){

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgRegisterInfoMapper.java

@@ -23,7 +23,7 @@ public interface IdxBizJgRegisterInfoMapper extends BaseMapper<IdxBizJgRegisterI
     @Select("update idx_biz_jg_register_info set \"USE_ORG_CODE\" = #{useOrgCode} where \"RECORD\" = #{equipCode}")
     Boolean updateUseOrgCodeByEquip(@Param("equipCode") String equipCode,@Param("useOrgCode") String useOrgCode);
 
-    @Select("select code as dictDataKey,name as dictDataValue from tz_equipment_category where parent_id = ( SELECT sub.id from tz_equipment_category as sub where sub.code = #{equipCode})")
+    @Select("select code as dictDataKey,name as dictDataValue from tz_equipment_category where parent_id = ( SELECT sub.id from tz_equipment_category as sub where sub.code = #{equipCode}) order by dictDataKey desc")
     List<DictionarieValueModel> queryAllEquCategoriesUnderTheEquList(@Param("equipCode") String equipCode);
 
     @MapKey("uscUnitCreditCode")