安装告知/使用登记/车用气瓶使用登记审核通过es中添加使用场所和使用地点字段值

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

@@ -58,7 +58,7 @@ public class JgUseRegistrationController extends BaseController {
                 String.valueOf(map.get("comment")),
                 String.valueOf(map.getOrDefault("carNumber", "")),
                 String.valueOf(map.getOrDefault("manageType", "")),
-                String.valueOf(map.get("nextTaskId")));
+                String.valueOf(map.get("nextTaskId")), map);
         return ResponseHelper.buildResponse("ok");
     }
 

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

@@ -1048,7 +1048,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                     this.justGenerateEquCode(idxBizJgRegisterInfo, jgInstallationNotice.getReceiveOrgCreditCode(), jgInstallationNotice);
                     tzsJgRegistrationInfoMapper.updateById(idxBizJgRegisterInfo);
                     // 更新es
-                    updateEquipEs(jgInstallationNotice, tzsJgOtherInfo, idxBizJgRegisterInfo, idxBizJgSupervisionInfo, map1);
+                    updateEquipEs(jgInstallationNotice, tzsJgOtherInfo, idxBizJgRegisterInfo, idxBizJgSupervisionInfo, map1, dto);
                     // 记录施工信息表
                     createConstruction2Db(jgInstallationNotice, jgRelationEquip);
 
@@ -1204,7 +1204,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
 
     private void updateEquipEs(JgInstallationNotice jgInstallationNotice, OtherInfo tzsJgOtherInfo,
                                IdxBizJgRegisterInfo tzsJgRegistrationInfo, IdxBizJgSupervisionInfo idxBizJgSupervisionInfo,
-                               Map<String, Object> map1) {
+                               Map<String, Object> map1, JgInstallationNoticeDto dto) {
         Map<String, Map<String, Object>> objMap = new HashMap<>();
         map1.put("EQU_CODE", tzsJgRegistrationInfo.getEquCode());
         map1.put("ORG_BRANCH_CODE", idxBizJgSupervisionInfo.getOrgBranchCode());
@@ -1213,6 +1213,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         map1.put("USE_UNIT_CREDIT_CODE", jgInstallationNotice.getUseUnitCreditCode());
         map1.put("USE_UNIT_NAME", jgInstallationNotice.getUseUnitName());
         map1.put("IS_INTO_MANAGEMENT", true);
+        map1.put("USE_SITE_CODE", dto.getProvince().split("_")[0] + "#" + dto.getCity().split("_")[0] + "#" + dto.getCounty().split("_")[0] + "#" + dto.getFactoryUseSiteStreet().split("_")[0]);
         map1.put("USC_UNIT_CREDIT_CODE", jgInstallationNotice.getInstallUnitCreditCode());
         map1.put("USC_UNIT_NAME", jgInstallationNotice.getInstallUnitName());
         map1.put("USE_PLACE", String.format("%s/%s/%s/%s", jgInstallationNotice.getProvinceName(), jgInstallationNotice.getCityName(), jgInstallationNotice.getCountyName(), jgInstallationNotice.getStreetName()));

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

@@ -838,6 +838,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         param.put("STATUS", "已认领");
         param.put("EQU_STATE", 1);
         param.put("IS_INTO_MANAGEMENT", true);
+        param.put("USE_SITE_CODE", "610000#" + jgVehicleInformation.getVehicleApanage());
         param.put("ORG_BRANCH_CODE", jgVehicleInformation.getOrgBranchCode());
         param.put("ORG_BRANCH_NAME", jgVehicleInformation.getOrgBranchName());
         param.put("EQU_CODE", dataMap.get("equCode"));