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/controller/JgUseRegistrationController.java

@@ -131,8 +131,16 @@ public class JgUseRegistrationController extends BaseController {
     public ResponseModel<Map<String, Object>> getMessage() {
         ReginParams selectedOrgInfo = getSelectedOrgInfo();
         HashMap<String, Object> map = new HashMap<>();
-        map.put("useUnitCreditCode", selectedOrgInfo.getCompany().getCompanyCode());
-        map.put("useUnitName", selectedOrgInfo.getCompany().getCompanyName());
+        String companyType = selectedOrgInfo.getCompany().getCompanyType();
+        if ("个人主体".equals(companyType)) {
+            String[] code = selectedOrgInfo.getCompany().getCompanyCode().split("_");
+            map.put("useUnitCreditCode", code.length > 1 ? code[1] : code[0]);
+            String[] companyName = selectedOrgInfo.getCompany().getCompanyName().split("_");
+            map.put("useUnitName", companyName.length > 1 ? companyName[1] : companyName[0]);
+        } else {
+            map.put("useUnitCreditCode", selectedOrgInfo.getCompany().getCompanyCode());
+            map.put("useUnitName", selectedOrgInfo.getCompany().getCompanyName());
+        }
         return ResponseHelper.buildResponse(map);
     }
 

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

@@ -773,12 +773,12 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
      * 根据record判断设备完成了哪些业务（安装告知/维保备案/使用登记）
      * @return
      */
-    public List<String> judgeTheBusinessAccordingByRecord(String record,Map<String, Object> objMap){
-        List<String> businessList = new ArrayList<>();
+    public String judgeTheBusinessAccordingByRecord(String record,Map<String, Object> objMap){
+        String business = "";
         // 安装告知
         Map<String, Object> installDetail = jgUseRegistrationMapper.getiInstallDetail(record);
         if (!ObjectUtils.isEmpty(installDetail)){
-            businessList.add("安装告知");
+            business = business + ",安装告知";
             objMap.putAll(installDetail);
             objMap.put("insOtherAccessories",JSON.parse(Optional.ofNullable(installDetail.get("insOtherAccessories")).orElse("").toString()));
             objMap.put("installProxyStatementAttachment",JSON.parse(Optional.ofNullable(installDetail.get("installProxyStatementAttachment")).orElse("").toString()));
@@ -787,7 +787,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         // 维保备案
         Map<String, Object> maintenanceDetail = jgUseRegistrationMapper.getMaintenanceDetail(record);
         if (!ObjectUtils.isEmpty(maintenanceDetail)){
-            businessList.add("维保备案");
+            business = business + ",维保备案";
             objMap.putAll(maintenanceDetail);
             objMap.put("maintenanceContract",JSON.parse(Optional.ofNullable(maintenanceDetail.get("maintenanceContract")).orElse("").toString()));
             objMap.put("maintOtherAccessories",JSON.parse(Optional.ofNullable(maintenanceDetail.get("maintOtherAccessories")).orElse("").toString()));
@@ -795,10 +795,10 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         // 使用登记
         Map<String, Object> useRegistrationDetail = jgUseRegistrationMapper.getUseRegistrationDetail(record);
         if (!ObjectUtils.isEmpty(useRegistrationDetail)){
-            businessList.add("使用登记");
+            business = business + ",使用登记";
             objMap.putAll(useRegistrationDetail);
         }
-        return businessList;
+        return business;
     }
 
     /**
@@ -1093,7 +1093,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             result.setTotal(0);
             return result;
         }
-        String companyCode = company.getString("companyCode");
+        String companyCode = company.getString("companyCode").contains("_") ?
+                company.getString("companyCode").split("_")[1] : company.getString("companyCode");
         String type = company.getString("companyType");
 
 
@@ -1190,7 +1191,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         if (!ObjectUtils.isEmpty(map.getString("USE_UNIT_CREDIT_CODE")) && !ObjectUtils.isEmpty(map.getString("USC_UNIT_CREDIT_CODE"))) {
             BoolQueryBuilder ubuilder = QueryBuilders.boolQuery();
             String useCode = QueryParser.escape(map.getString("USE_UNIT_CREDIT_CODE"));
-            // useCode = useCode.contains("_") ? useCode.split("_")[0] : useCode;
+            useCode = useCode.contains("_") ? useCode.split("_")[0] : useCode;
             ubuilder.should(QueryBuilders.matchQuery("USE_UNIT_CREDIT_CODE", useCode));
 
             String uscCode = QueryParser.escape(map.getString("USC_UNIT_CREDIT_CODE")).toLowerCase();
@@ -1202,7 +1203,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 BoolQueryBuilder uuccBuilder = QueryBuilders.boolQuery();
                 String uucc = !ValidationUtil.isEmpty(map.getString("USE_UNIT_CREDIT_CODE")) ? map.getString("USE_UNIT_CREDIT_CODE") : map.getString("useUnitCreditCode");
                 String param = QueryParser.escape(uucc);
-                // param = param.contains("_") ? param.split("_")[0] : param;
+                param = param.contains("_") ? param.split("_")[0] : param;
                 uuccBuilder.must(QueryBuilders.matchQuery("USE_UNIT_CREDIT_CODE", param));
                 boolMust.must(uuccBuilder);
             }