1.台套历史设备登记，按改为单位名称可自选输入，由于单位code未使用，故不在存code

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

@@ -1428,6 +1428,39 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         tzsServiceFeignClient.commonUpdateEsDataByIds(objMap);
     }
 
+    public void updateEsData2(String usePlace, JSONObject dataMap, IdxBizJgOtherInfo otherInfo,IdxBizJgUseInfo useInfo,
+                             JgUseRegistration jgUseRegistration, JSONObject jsonObject) {
+        // 更新es
+        HashMap<String, Map<String, Object>> objMap = new HashMap<>();
+        HashMap<String, Object> param = new HashMap<>();
+        // 属地监管部门拆分
+        String orgBranch = (String) dataMap.getOrDefault("orgBranchCode", "_");
+        String[] split = orgBranch.split("_");
+        param.put("SUPERVISORY_CODE", otherInfo.getSupervisoryCode());
+        param.put("CODE96333", otherInfo.getCode96333());
+        param.put("USE_UNIT_CREDIT_CODE", dataMap.get("useUnitCreditCode"));
+        param.put("USE_UNIT_NAME", dataMap.get("useUnitName"));
+        param.put("ADDRESS", dataMap.getOrDefault("address", ""));
+        param.put("USE_PLACE", usePlace);
+        param.put("STATUS", "已认领");
+        param.put("EQU_STATE", 1);
+        // 更新es的下次检验日期
+        param.put("NEXT_INSPECT_DATE", this.castDate2TimeStr(dataMap.getString("nextInspectDate")));
+        param.put("USE_INNER_CODE", useInfo.getUseInnerCode());
+        param.put("IS_INTO_MANAGEMENT", true);
+        param.put("USE_PLACE_CODE", jsonObject.get("province") + "#" + jsonObject.get("city") + "#" + jsonObject.get("county") + "#" + jsonObject.get("factoryUseSiteStreet"));
+        param.put("USE_SITE_CODE", String.valueOf(jsonObject.get("usePlace")));
+        param.put("ORG_BRANCH_CODE", split[0]);
+        param.put("ORG_BRANCH_NAME", split[1]);
+        param.put("USC_UNIT_CREDIT_CODE", "");
+        param.put("USC_UNIT_NAME", dataMap.getString("uscUnitName"));
+        param.put("EQU_CODE", dataMap.get("equCode"));
+        param.put("USE_ORG_CODE", jgUseRegistration.getUseRegistrationCode());
+        param.put("CYLINDER_CATEGORY", dataMap.get("cylinderCategory"));
+        objMap.put((String) dataMap.get("equipId"), param);
+        tzsServiceFeignClient.commonUpdateEsDataByIds(objMap);
+    }
+
     private Long castDate2TimeStr(String nextInspectDate) {
         if(nextInspectDate != null){
             return DateUtil.parse(nextInspectDate).getTime();
@@ -2974,7 +3007,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 this.createCode(map, jgUseRegistration, registerInfo, useInfo, otherInfo);
                 map.put("equCode", equCode);
                 // 更新es
-                this.updateEsData(usePlace, map, otherInfo,useInfo, jgUseRegistration, map);
+                this.updateEsData2(usePlace, map, otherInfo,useInfo, jgUseRegistration, map);
                 this.updateById(jgUseRegistration);
 
                 // 设备安装信息更新
@@ -3035,8 +3068,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 
         IdxBizJgConstructionInfo constructionInfo = idxBizJgConstructionInfoService.queryNewestDetailByRecord(String.valueOf(map.get("equipId")));
         if (!ValidationUtil.isEmpty(constructionInfo.getSequenceNbr())) {
-            constructionInfo.setUscUnitCreditCode(ValidationUtil.isEmpty(map.get("uscUnitCodeAndName")) ? null : String.valueOf(map.get("uscUnitCodeAndName")).split("_")[0]);
-            constructionInfo.setUscUnitName(ValidationUtil.isEmpty(map.get("uscUnitCodeAndName")) ? null : String.valueOf(map.get("uscUnitCodeAndName")).split("_")[1]);
+            constructionInfo.setUscUnitName(ValidationUtil.isEmpty(map.get("uscUnitName")) ? null : String.valueOf(map.get("uscUnitName")));
             constructionInfo.setConstructionLeaderName(ValidationUtil.isEmpty(map.get("installLeaderId")) ? null : String.valueOf(map.get("installLeaderId")));
             constructionInfo.setConstructionLeaderPhone(ValidationUtil.isEmpty(map.get("installLeaderPhone")) ? null : String.valueOf(map.get("installLeaderPhone")));
             constructionInfo.setProxyStatementAttachment(ValidationUtil.isEmpty(map.get("proxyStatementAttachmentList")) ? null : JSONObject.toJSONString(map.get("proxyStatementAttachmentList")));