Skip to content

A
amos-boot-biz
Commit 0ab6b2bb authored by 韩桐桐's avatar 韩桐桐
Browse files
Options

fix(jg):移装告知不修改设备信息及es数据

parent 904d2b84
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 25 deletions
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
View file @ 0ab6b2bb
......@@ -853,32 +853,32 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
jgTransferNotice.setPromoter("");
jgTransferNotice.setHandleDate(new Date());
jgTransferNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
//修改设备ES设备使用场所和设备详细使用地址
Map<String, Map<String, Object>> objMap = new HashMap<>();
for (JgTransferNoticeEq eq : jgTransferNoticeEqs) {
Map<String, Object> map1 = new HashMap<>();
map1.put("USE_PLACE", String.format("%s/%s/%s", jgTransferNotice.getProvinceName(), jgTransferNotice.getCityName(), jgTransferNotice.getCityName()));
map1.put("ADDRESS", String.format("%s/%s", jgTransferNotice.getStreetName(), jgTransferNotice.getAddress()));
objMap.put(eq.getEquId(), map1);
}
tzsServiceFeignClient.commonUpdateEsDataByIds(objMap);
//修改设备ES设备使用场所和设备详细使用地址 ---- 移装告知不修改设备信息及es数据 BUG 21679
// Map<String, Map<String, Object>> objMap = new HashMap<>();
// for (JgTransferNoticeEq eq : jgTransferNoticeEqs) {
// Map<String, Object> map1 = new HashMap<>();
// map1.put("USE_PLACE", String.format("%s/%s/%s", jgTransferNotice.getProvinceName(), jgTransferNotice.getCityName(), jgTransferNotice.getCityName()));
// map1.put("ADDRESS", String.format("%s/%s", jgTransferNotice.getStreetName(), jgTransferNotice.getAddress()));
// objMap.put(eq.getEquId(), map1);
// }
// tzsServiceFeignClient.commonUpdateEsDataByIds(objMap);
// 修改使用信息
List<String> equIds = jgTransferNoticeEqs.stream().map(JgTransferNoticeEq::getEquId).collect(Collectors.toList());
LambdaUpdateWrapper<IdxBizJgUseInfo> lambda = new LambdaUpdateWrapper<>();
lambda.in(IdxBizJgUseInfo::getRecord, equIds);
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);
// 修改使用信息 ---- 移装告知不修改设备信息及es数据 BUG 21679
// List<String> equIds = jgTransferNoticeEqs.stream().map(JgTransferNoticeEq::getEquId).collect(Collectors.toList());
// LambdaUpdateWrapper<IdxBizJgUseInfo> lambda = new LambdaUpdateWrapper<>();
// lambda.in(IdxBizJgUseInfo::getRecord, equIds);
// 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<>();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment