安装告知 和移装告知 业务完成后修改使用信息

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

@@ -134,6 +134,9 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     IIdxBizJgUseInfoService useInfoService;
 
     @Autowired
+    IdxBizJgUseInfoMapper idxBizJgUseInfoMapper;
+
+    @Autowired
     private DataDictionaryMapper dataDictionaryMapper;
 
     @Autowired
@@ -861,7 +864,11 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 map1.put("USE_UNIT_NAME",jgInstallationNotice.getUseUnitName());
                 map1.put("USC_UNIT_CREDIT_CODE",jgInstallationNotice.getInstallUnitCreditCode());
                 map1.put("USC_UNIT_NAME",jgInstallationNotice.getInstallUnitName());
-                objMap.put(tzsJgOtherInfo.getRecord(),map1);
+                map1.put("ORG_BRANCH_CODE",jgInstallationNotice.getOrgBranchCode());
+                map1.put("ORG_BRANCH_NAME",jgInstallationNotice.getOrgBranchCode());
+                map1.put("USE_PLACE",String.format("%s/%s/%s", jgInstallationNotice.getProvinceName(), jgInstallationNotice.getCityName(), jgInstallationNotice.getCounty()));
+                map1.put("ADDRESS",String.format("%s/%s", jgInstallationNotice.getStreetName(), jgInstallationNotice.getAddress()));
+                objMap.put(tzsJgOtherInfo.getRecord(), map1);
                 jgInstallationNotice.setPromoter("");
                 tzsServiceFeignClient.commonUpdateEsDataByIds(objMap);
                 tzsJgOtherInfoMapper.updateById(tzsJgOtherInfo);
@@ -897,12 +904,23 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 superviseInfo.setOrgBranchName(jgInstallationNotice.getOrgBranchName());
                 superviseInfo.setOrgBranchCode(jgInstallationNotice.getOrgBranchCode());
                 superviseInfoMapper.update(superviseInfo, lambdaUpdateWrapper);
-                HashMap<String, Object> hashMap = new HashMap<>();
-                Map<String,Map<String,Object>> superMap = new HashMap<>();
-                hashMap.put("ORG_BRANCH_CODE",jgInstallationNotice.getOrgBranchCode());
-                hashMap.put("ORG_BRANCH_NAME",jgInstallationNotice.getOrgBranchCode());
-                superMap.put(jgRelationEquip.getEquId(), hashMap);
-                tzsServiceFeignClient.commonUpdateEsDataByIds(superMap);
+                // 修改使用信息
+                LambdaUpdateWrapper<IdxBizJgUseInfo> lambda = new LambdaUpdateWrapper<>();
+                lambda.eq(IdxBizJgUseInfo::getRecord, jgRelationEquip.getEquId());
+                IdxBizJgUseInfo idxBizJgUseInfo = new IdxBizJgUseInfo();
+                idxBizJgUseInfo.setProvince(jgInstallationNotice.getProvince());
+                idxBizJgUseInfo.setProvinceName(jgInstallationNotice.getProvinceName());
+                idxBizJgUseInfo.setCity(jgInstallationNotice.getCity());
+                idxBizJgUseInfo.setCityName(jgInstallationNotice.getCityName());
+                idxBizJgUseInfo.setCounty(jgInstallationNotice.getCounty());
+                idxBizJgUseInfo.setCountyName(jgInstallationNotice.getCountyName());
+                idxBizJgUseInfo.setFactoryUseSiteStreet(jgInstallationNotice.getFactoryUseSiteStreet());
+                idxBizJgUseInfo.setStreetName(jgInstallationNotice.getStreetName());
+                idxBizJgUseInfo.setAddress(jgInstallationNotice.getAddress());
+                idxBizJgUseInfo.setIsNotXiXian(jgInstallationNotice.getIsXixian());
+                idxBizJgUseInfoMapper.update(idxBizJgUseInfo, lambda);
+
+
                 // 上个代办改为已办
                 HashMap<String, Object> taskMap = new HashMap<>();
                 taskMap.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
@@ -25,6 +26,7 @@ import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService;
 import com.yeejoin.amos.boot.module.jg.biz.utils.ImageUtils;
 import com.yeejoin.amos.boot.module.jg.biz.utils.WordTemplateUtils;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.RegistrationInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseUnitLicence;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
@@ -98,6 +100,10 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
     @Autowired
     ICmWorkflowService iCmWorkflowService;
 
+
+    @Autowired
+    IdxBizJgUseInfoMapper idxBizJgUseInfoMapper;
+
     /**
      * 根据sequenceNbr查询
      *
@@ -708,6 +714,30 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 jgTransferNotice.setHandleDate(new Date());
                 jgTransferNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
                 this.generateTransferNoticeReport(jgTransferNotice.getSequenceNbr());
+
+                Map<String,Object> map1 =new HashMap<>();
+                Map<String,Map<String,Object>> objMap = new HashMap<>();
+                map1.put("USE_PLACE",String.format("%s/%s/%s", jgTransferNotice.getProvinceName(), jgTransferNotice.getCityName(), jgTransferNotice.getCounty()));
+                map1.put("ADDRESS",String.format("%s/%s", jgTransferNotice.getStreetName(), jgTransferNotice.getAddress()));
+                objMap.put(jgTransferNoticeEq.getEquId(), map1);
+                tzsServiceFeignClient.commonUpdateEsDataByIds(objMap);
+
+                // 修改使用信息
+                LambdaUpdateWrapper<IdxBizJgUseInfo> lambda = new LambdaUpdateWrapper<>();
+                lambda.eq(IdxBizJgUseInfo::getRecord, jgTransferNoticeEq.getEquId());
+                IdxBizJgUseInfo idxBizJgUseInfo = new IdxBizJgUseInfo();
+                idxBizJgUseInfo.setProvince(jgTransferNotice.getProvince());
+                idxBizJgUseInfo.setProvinceName(jgTransferNotice.getProvinceName());
+                idxBizJgUseInfo.setCity(jgTransferNotice.getCity());
+                idxBizJgUseInfo.setCityName(jgTransferNotice.getCityName());
+                idxBizJgUseInfo.setCounty(jgTransferNotice.getCounty());
+                idxBizJgUseInfo.setCountyName(jgTransferNotice.getCountyName());
+                idxBizJgUseInfo.setFactoryUseSiteStreet(jgTransferNotice.getFactoryUseSiteStreet());
+                idxBizJgUseInfo.setStreetName(jgTransferNotice.getStreetName());
+                idxBizJgUseInfo.setAddress(jgTransferNotice.getAddress());
+                idxBizJgUseInfo.setIsNotXiXian(jgTransferNotice.getIsXixian());
+                idxBizJgUseInfoMapper.update(idxBizJgUseInfo, lambda);
+
                 // 上个代办改为已办
                 HashMap<String, Object> taskMap = new HashMap<>();
                 taskMap.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());