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

@@ -1961,18 +1961,26 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         }
         // 使用登记
 //        Map<String, Object> useRegistrationDetail = jgUseRegistrationMapper.getUseRegistrationDetail(record);
-        JgUseRegistrationManage jgUseRegistrationManage = jgUseRegistrationManageService.lambdaQuery()
-                .select(JgUseRegistrationManage::getReceiveOrgName, JgUseRegistrationManage::getReceiveCompanyCode)
+        // 查询使用登记
+        StringBuilder businessBuilder = new StringBuilder(business);
+        List<JgUseRegistrationManage> regs = jgUseRegistrationManageService.lambdaQuery()
+                .select(JgUseRegistrationManage::getReceiveOrgName,
+                        JgUseRegistrationManage::getReceiveCompanyCode)
                 .eq(JgUseRegistrationManage::getUseRegistrationCode, useRegistrationCode)
                 .eq(JgUseRegistrationManage::getIsDelete, false)
                 .eq(JgUseRegistrationManage::getCertificateStatus, YIDENGJI.getName())
-                .one();
-        if (!ObjectUtils.isEmpty(jgUseRegistrationManage)) {
-            business = business + ",使用登记";
-//            objMap.putAll(useRegistrationDetail);
+                .list();
+
+        if (regs.size() > 1) {
+            throw new BadRequest("使用登记重复"+ useRegistrationCode);
+        }
+
+        if (!regs.isEmpty()) {
+            JgUseRegistrationManage jgUseRegistrationManage = regs.get(0);
+            businessBuilder.append(",使用登记");
             objMap.put("receiveCompanyCode", jgUseRegistrationManage.getReceiveCompanyCode());
         }
-        return business;
+        return businessBuilder.toString();
     }
 
     /**

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

@@ -451,10 +451,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         LambdaQueryWrapper<IdxBizJgUseInfo> lambda = new QueryWrapper<IdxBizJgUseInfo>().lambda();
         lambda.eq(IdxBizJgUseInfo::getRecord, map.get("equipId"));
         // 产权单位信息
-        if (map.containsKey("estateUnitName")) {
-            String[] data = String.valueOf(map.getString("estateUnitName")).split("_");
-            useInfo.setEstateUnitCreditCode(data[0]);
-            useInfo.setEstateUnitName(data[1]);
+        if (!ValidationUtil.isEmpty(map.getString("estateUnitSeq"))) {
+            String estateUnitSeq = String.valueOf(map.getString("estateUnitSeq"));
+            Map<String, String> propertyUnitInfo = commonServiceImpl.queryTcmUnitInfoBySeq(estateUnitSeq, TcmUnitTypeEnum.CQ.getCode());
+            useInfo.setEstateUnitCreditCode(propertyUnitInfo.get("unitCode"));
+            useInfo.setEstateUnitName(propertyUnitInfo.get("unitName"));
         }
         // 修改设备使用状态为在用
         useInfo.setEquState(String.valueOf(EquimentEnum.ZAIYONG.getCode()));