Skip to content

A
amos-boot-biz
Commit 9b4ae6d4 authored by suhuiguang's avatar suhuiguang
Browse files
Options

1.报废自测少更新字段bug

parent bb62f685
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 14 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/JgScrapCancelServiceImpl.java
View file @ 9b4ae6d4
...@@ -982,17 +982,14 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc ...@@ -982,17 +982,14 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
jgUseRegistrationManageList = jgUseRegistrationManageList.stream().filter(item -> !CylinderTypeEnum.CYLINDER.getCode().equals(item.getEquCategoryCode()) || item.getRegType().equals(BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.getName())).collect(Collectors.toList()); jgUseRegistrationManageList = jgUseRegistrationManageList.stream().filter(item -> !CylinderTypeEnum.CYLINDER.getCode().equals(item.getEquCategoryCode()) || item.getRegType().equals(BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.getName())).collect(Collectors.toList());
//组装条件进行修改 //组装条件进行修改
if (!ObjectUtils.isEmpty(jgUseRegistrationManageList)) { if (!ObjectUtils.isEmpty(jgUseRegistrationManageList)) {
List<Long> seqList = jgUseRegistrationManageList.stream().map(JgUseRegistrationManage::getSequenceNbr).collect(Collectors.toList()); for(JgUseRegistrationManage useRegistrationManage : jgUseRegistrationManageList){
//组装update条件 useRegistrationManage.setCertificateStatus(CertificateStatusEnum.YIZHUXIAO.getName());
LambdaQueryWrapper<JgUseRegistrationManage> updateLambdaQueryWrapper = new LambdaQueryWrapper<>(); useRegistrationManage.setVersion(useRegistrationManage.getVersion() + 1);
updateLambdaQueryWrapper.in(JgUseRegistrationManage::getSequenceNbr, seqList); useRegistrationManage.setChangeReason(BusinessTypeEnum.JG_EQUIPMENT_CANCEL.getName());
//设置证状态进行修改 useRegistrationManage.setIsScrap("1");
JgUseRegistrationManage jgUseRegistrationManage = new JgUseRegistrationManage(); useRegistrationManage.setRecDate(new Date());
jgUseRegistrationManage.setCertificateStatus(CertificateStatusEnum.YIZHUXIAO.getName()); }
jgUseRegistrationManage.setVersion(jgUseRegistrationManage.getVersion() + 1); jgUseRegistrationManageService.updateBatchById(jgUseRegistrationManageList);
jgUseRegistrationManage.setChangeReason(BusinessTypeEnum.JG_EQUIPMENT_CANCEL.getName());
jgUseRegistrationManage.setIsScrap("1");
jgUseRegistrationManageMapper.update(jgUseRegistrationManage, updateLambdaQueryWrapper);
} }
} else { } else {
SuperviseInfo superviseInfo = new SuperviseInfo(); SuperviseInfo superviseInfo = new SuperviseInfo();
...@@ -1006,13 +1003,11 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc ...@@ -1006,13 +1003,11 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
map1.put("EQU_STATE", String.valueOf(EquimentEnum.ZHUXIAO.getCode())); map1.put("EQU_STATE", String.valueOf(EquimentEnum.ZHUXIAO.getCode()));
idxBizJgUseInfoMapper.batchUpdateUseInfo(equipIds, EquimentEnum.ZHUXIAO.getCode()); idxBizJgUseInfoMapper.batchUpdateUseInfo(equipIds, EquimentEnum.ZHUXIAO.getCode());
// 修改证管理表中的证的状态 // 修改证管理表中的证的状态
LambdaUpdateWrapper<JgUseRegistrationManage> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.in(JgUseRegistrationManage::getSequenceNbr, jgUseRegistrationManageList.stream().map(JgUseRegistrationManage::getSequenceNbr).collect(Collectors.toList()));
updateWrapper.set(JgUseRegistrationManage::getCertificateStatus, CertificateStatusEnum.YIZHUXIAO.getName());
for(JgUseRegistrationManage useRegistrationManage : jgUseRegistrationManageList){ for(JgUseRegistrationManage useRegistrationManage : jgUseRegistrationManageList){
useRegistrationManage.setCertificateStatus(CertificateStatusEnum.YIZHUXIAO.getName()); useRegistrationManage.setCertificateStatus(CertificateStatusEnum.YIZHUXIAO.getName());
useRegistrationManage.setVersion(useRegistrationManage.getVersion() + 1); useRegistrationManage.setVersion(useRegistrationManage.getVersion() + 1);
useRegistrationManage.setChangeReason(BusinessTypeEnum.JG_EQUIPMENT_MOVE.getName()); useRegistrationManage.setChangeReason(BusinessTypeEnum.JG_EQUIPMENT_MOVE.getName());
useRegistrationManage.setRecDate(new Date());
} }
jgUseRegistrationManageService.updateBatchById(jgUseRegistrationManageList); jgUseRegistrationManageService.updateBatchById(jgUseRegistrationManageList);
} }
......
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