Skip to content

A
amos-boot-biz
Commit 3e730809 authored by lisong's avatar lisong
Browse files
Options

监管码导出bug修复

parent 7943cbaf
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 10 deletions
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/controller/EquipmentCategoryController.java
View file @ 3e730809
...@@ -491,11 +491,14 @@ public class EquipmentCategoryController extends BaseController { ...@@ -491,11 +491,14 @@ public class EquipmentCategoryController extends BaseController {
LambdaQueryWrapper<IdxBizJgOtherInfo> lambda = new QueryWrapper<IdxBizJgOtherInfo>().lambda(); LambdaQueryWrapper<IdxBizJgOtherInfo> lambda = new QueryWrapper<IdxBizJgOtherInfo>().lambda();
lambda.eq(IdxBizJgOtherInfo::getClaimStatus, "已认领"); lambda.eq(IdxBizJgOtherInfo::getClaimStatus, "已认领");
lambda.in(IdxBizJgOtherInfo::getCode96333, code96333); lambda.in(IdxBizJgOtherInfo::getCode96333, code96333);
Integer integer = idxBizJgOtherInfoMapper.selectCount(lambda); // Integer integer = idxBizJgOtherInfoMapper.selectCount(lambda);
if (!ObjectUtils.isEmpty(strings) && strings.size() != integer){ List<IdxBizJgOtherInfo> idxBizJgOtherInfos = idxBizJgOtherInfoMapper.selectList(lambda);
throw new FileDownLoadException("96333码存在重复数据，请联系管理员！"); List<String> collect = idxBizJgOtherInfos.stream().map(IdxBizJgOtherInfo::getCode96333).collect(Collectors.toList());
} HashSet<String> strings1 = new HashSet<>(collect);
if (ObjectUtils.isEmpty(strings) && !String.valueOf(code96333.size()).equals(String.valueOf(integer))) { // if (!ObjectUtils.isEmpty(strings) && strings.size() != strings1.size()){
// throw new FileDownLoadException("96333码存在重复数据，请联系管理员！");
// }
if (code96333.size()!=strings1.size()) {
throw new FileDownLoadException("96333码存在重复数据，请联系管理员！"); throw new FileDownLoadException("96333码存在重复数据，请联系管理员！");
} }
} }
...@@ -504,11 +507,11 @@ public class EquipmentCategoryController extends BaseController { ...@@ -504,11 +507,11 @@ public class EquipmentCategoryController extends BaseController {
LambdaQueryWrapper<IdxBizJgOtherInfo> lambda = new QueryWrapper<IdxBizJgOtherInfo>().lambda(); LambdaQueryWrapper<IdxBizJgOtherInfo> lambda = new QueryWrapper<IdxBizJgOtherInfo>().lambda();
lambda.eq(IdxBizJgOtherInfo::getClaimStatus, "已认领"); lambda.eq(IdxBizJgOtherInfo::getClaimStatus, "已认领");
lambda.in(IdxBizJgOtherInfo::getSupervisoryCode, supervisoryCode); lambda.in(IdxBizJgOtherInfo::getSupervisoryCode, supervisoryCode);
Integer integer = idxBizJgOtherInfoMapper.selectCount(lambda); // Integer integer = idxBizJgOtherInfoMapper.selectCount(lambda);
if (!ObjectUtils.isEmpty(strings) && strings.size() != integer){ List<IdxBizJgOtherInfo> idxBizJgOtherInfos = idxBizJgOtherInfoMapper.selectList(lambda);
throw new FileDownLoadException("监管码存在重复数据，请联系管理员！"); List<String> collect = idxBizJgOtherInfos.stream().map(IdxBizJgOtherInfo::getSupervisoryCode).collect(Collectors.toList());
} HashSet<String> strings1 = new HashSet<>(collect);
if (ObjectUtils.isEmpty(strings) && !String.valueOf(supervisoryCode.size()).equals(String.valueOf(integer))) { if (supervisoryCode.size() != strings1.size()) {
throw new FileDownLoadException("监管码存在重复数据，请联系管理员！"); throw new FileDownLoadException("监管码存在重复数据，请联系管理员！");
} }
} }
......
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