安装告知/使用登记/车用气瓶使用登记审核通过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/JgUseRegistrationServiceImpl.java

@@ -546,14 +546,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     List<WorkflowResultDto> resultDto = commonServiceImpl.buildWorkFlowInfo(processTaskDTOS);
                     if (!ObjectUtils.isEmpty(resultDto) && !ObjectUtils.isEmpty(resultDto.get(0))) {
                         WorkflowResultDto workflowResultDto = resultDto.get(0);
-                        updateData(jgUseRegistration.getSequenceNbr(), "0", workflowResultDto, "", Boolean.TRUE);
+                        updateData(jgUseRegistration.getSequenceNbr(), "0", workflowResultDto, "", Boolean.TRUE, null);
                     }
 
                 }
 
                 if (!ObjectUtils.isEmpty(instanceId)) {
                     // 执行流程
-                    flowExecute(jgUseRegistration.getSequenceNbr(), instanceId, "0", "", "", map.getString("manageType"), String.valueOf(map.get("nextTaskId")));
+                    flowExecute(jgUseRegistration.getSequenceNbr(), instanceId, "0", "", "", map.getString("manageType"), String.valueOf(map.get("nextTaskId")),null);
                 }
             } else {
                 if (ObjectUtils.isEmpty(map.get("instanceId"))) {
@@ -749,10 +749,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     resultDto.stream()
                             .findFirst()
                             .ifPresent(workflowResultDto ->
-                                    this.updateUseRegUnitData(useRegistration.getSequenceNbr(), "0", workflowResultDto, true));
+                                    this.updateUseRegUnitData(useRegistration.getSequenceNbr(), "0", workflowResultDto, true, null));
                 } else {
                     // 执行流程
-                    flowExecute(useRegistration.getSequenceNbr(), useRegistration.getInstanceId(), "0", "", "", map.getString("manageType"), String.valueOf(map.get("nextTaskId")));
+                    flowExecute(useRegistration.getSequenceNbr(), useRegistration.getInstanceId(), "0", "", "", map.getString("manageType"), String.valueOf(map.get("nextTaskId")),null);
                 }
             } else {
                 String equType = this.baseMapper.getEquType(String.valueOf(map.get("EQU_LIST_CODE")));
@@ -792,7 +792,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
      * @param workflowResultDto 工作流返回
      * @param isFirst           是否first
      */
-    private void updateUseRegUnitData(Long sequenceNbr, String operate, WorkflowResultDto workflowResultDto, Boolean isFirst) {
+    private void updateUseRegUnitData(Long sequenceNbr, String operate, WorkflowResultDto workflowResultDto, Boolean isFirst,JSONObject jsonObject) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())) + "", ReginParams.class);
         String role = workflowResultDto.getNextExecutorRoleIds();
         String taskCode = FlowStatusEnum.TO_BE_FINISHED.getName();
@@ -884,7 +884,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoMapper.selectOne(lambdaReg);
 
                     // 更新设备信息 && 生成使用登记证编号 && 同步es
-                    processMapData(sequenceNbr, mapData, jgUseRegistration, jgRegistrationHistory,registerInfo,taskV2Model);
+                    processMapData(sequenceNbr, mapData, jgUseRegistration, jgRegistrationHistory,registerInfo,taskV2Model,jsonObject);
 
                     // 查询设备制造信息
                     LambdaQueryWrapper<IdxBizJgFactoryInfo> factoryInfoWrapper = new LambdaQueryWrapper<>();
@@ -995,7 +995,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         jgUseRegistrationManageService.save(jgUseRegistrationManage);
     }
 
-    public JgUseRegistration updateData(Long sequenceNbr, String operate, WorkflowResultDto workflowResultDto, String carNumber, Boolean isFirst) {
+    public JgUseRegistration updateData(Long sequenceNbr, String operate, WorkflowResultDto workflowResultDto, String carNumber, Boolean isFirst,JSONObject jsonObject) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         String role = workflowResultDto.getNextExecutorRoleIds();
         String taskCode = FlowStatusEnum.TO_BE_FINISHED.getName();
@@ -1094,7 +1094,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             // 更新代办
             TaskV2Model taskV2Model = updateAgency(jgUseRegistration);
 
-            processMapData(sequenceNbr, mapData, jgUseRegistration, jgRegistrationHistory,registerInfo,taskV2Model);
+            processMapData(sequenceNbr, mapData, jgUseRegistration, jgRegistrationHistory, registerInfo, taskV2Model, jsonObject);
 
             // 生成证书管理表记录
             generateRegistrationManage(jgUseRegistration,registerInfo);
@@ -1120,7 +1120,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     }
 
     private void processMapData(Long sequenceNbr, JSONObject mapData, JgUseRegistration jgUseRegistration,
-                                JgRegistrationHistory jgRegistrationHistory,IdxBizJgRegisterInfo registerInfo,TaskV2Model taskV2Model) {
+                                JgRegistrationHistory jgRegistrationHistory,IdxBizJgRegisterInfo registerInfo,TaskV2Model taskV2Model,JSONObject jsonObject) {
         // 其他信息
         LambdaQueryWrapper<IdxBizJgOtherInfo> lambdaOth = new QueryWrapper<IdxBizJgOtherInfo>().lambda();
         lambdaOth.eq(IdxBizJgOtherInfo::getRecord, String.valueOf(mapData.get("equipId")));
@@ -1173,7 +1173,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         useInfo.setIsIntoManagement(Boolean.TRUE);
         useInfoMapper.updateById(useInfo);
         // 更新es
-        updateEsData(usePlace, mapData, otherInfo, jgUseRegistration);
+        updateEsData(usePlace, mapData, otherInfo, jgUseRegistration, jsonObject);
         jgResumeInfoService.createWithModel(JgResumeInfoDto.builder()
                 .applyNo(jgUseRegistration.getApplyNo())
                 .businessType(BusinessTypeEnum.JG_USAGE_REGISTRATION.getName())
@@ -1242,7 +1242,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         return codeUtil.generateEquipmentCode(codeGenerateDto);
     }
 
-    public void updateEsData(String usePlace, JSONObject dataMap, IdxBizJgOtherInfo otherInfo, JgUseRegistration jgUseRegistration) {
+    public void updateEsData(String usePlace, JSONObject dataMap, IdxBizJgOtherInfo otherInfo, JgUseRegistration jgUseRegistration,JSONObject jsonObject) {
         // 属地监管部门拆分
         String orgBranch = (String) dataMap.getOrDefault("orgBranchCode", "_");
         String[] split = orgBranch.split("_");
@@ -1258,6 +1258,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         param.put("STATUS", "已认领");
         param.put("EQU_STATE", 1);
         param.put("IS_INTO_MANAGEMENT", true);
+        param.put("USE_SITE_CODE", jsonObject.get("province") + "#" + jsonObject.get("city") + "#" + jsonObject.get("county") + "#" + jsonObject.get("factoryUseSiteStreet"));
+        param.put("USE_PLACE_CODE", String.valueOf(jsonObject.get("usePlace")));
         param.put("ORG_BRANCH_CODE", split[0]);
         param.put("ORG_BRANCH_NAME", split[1]);
         param.put("EQU_CODE", dataMap.get("equCode"));
@@ -1317,7 +1319,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 
     @Transactional(rollbackFor = Exception.class)
     @GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 600000)
-    public void flowExecute(Long id, String instanceId, String operate, String comment, String carNumber, String manageType, String nextTaskId) {
+    public void flowExecute(Long id, String instanceId, String operate, String comment, String carNumber, String manageType, String nextTaskId, JSONObject jsonObject) {
         String lockKey = CommonServiceImpl.buildJgExecuteLockKey(instanceId);
         RLock lock = redissonClient.getLock(lockKey);
         try {
@@ -1376,9 +1378,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 WorkflowResultDto workflowResultDto = resultDto.get(0);
                 // 按单位办理
                 if ("unit".equals(manageType)) {
-                    this.updateUseRegUnitData(jgUseRegistration.getSequenceNbr(), operate, workflowResultDto, false);
+                    this.updateUseRegUnitData(jgUseRegistration.getSequenceNbr(), operate, workflowResultDto, false, jsonObject);
                 } else {
-                    this.updateData(jgUseRegistration.getSequenceNbr(), operate, workflowResultDto, carNumber, false);
+                    this.updateData(jgUseRegistration.getSequenceNbr(), operate, workflowResultDto, carNumber, false, jsonObject);
                 }
             }
             this.clearDataForCheckEquipRepeatUsed(jgUseRegistration);
@@ -2221,9 +2223,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             workflowResultDto.setNextTaskId(jgUseRegistration.getNextTaskId());
             workflowResultDto.setNextExecutorUserIds(jgUseRegistration.getNextExecuteUserIds());
             if (jgUseRegistration.getManageType().equals("unit")) {
-                this.updateUseRegUnitData(jgUseRegistration.getSequenceNbr(), "0", workflowResultDto, false);
+                this.updateUseRegUnitData(jgUseRegistration.getSequenceNbr(), "0", workflowResultDto, false, null);
             } else {
-                this.updateData(jgUseRegistration.getSequenceNbr(), "0", workflowResultDto, null, false);
+                this.updateData(jgUseRegistration.getSequenceNbr(), "0", workflowResultDto, null, false, null);
             }
         });
     }

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"));