Commit 4af377340a17e3b25e55ee48095c75a9e824c12a
1 parent
64acf7a8
feature(*): 按照索引搜索
按照索引搜索
Showing
1 changed file
with
6 additions
and
4 deletions
fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalCalculateService.java
... | ... | @@ -907,15 +907,17 @@ public class EvalCalculateService { |
907 | 907 | } |
908 | 908 | |
909 | 909 | if (CollectionUtils.isNotEmpty(indicatorDetails)) { |
910 | - List<EvalPoolIndicatorDetail> evalPoolIndicatorDetails = evalPoolIndicatorDetailService.list(Wrappers.<EvalPoolIndicatorDetail>lambdaQuery() | |
910 | + List<EvalPoolIndicatorDetail> oldEvalPoolIndicatorDetails = evalPoolIndicatorDetailService.list(Wrappers.<EvalPoolIndicatorDetail>lambdaQuery() | |
911 | 911 | .eq(EvalPoolIndicatorDetail::getPoolId, poolId) |
912 | 912 | .eq(EvalPoolIndicatorDetail::getScopeType, userShop.getScopeType()) |
913 | 913 | .eq(EvalPoolIndicatorDetail::getStageDim, userShop.getStageDimEnum()) |
914 | 914 | .eq(EvalPoolIndicatorDetail::getEvalGroupId, evalGroupId) |
915 | 915 | .eq(EvalPoolIndicatorDetail::getDataDate, userShop.getDataDate()) |
916 | - .eq(EvalPoolIndicatorDetail::getYn, Boolean.TRUE)); | |
917 | - if (PublicUtil.isNotEmpty(evalPoolIndicatorDetails)) { | |
918 | - List<Long> detailIds = evalPoolIndicatorDetails.stream().map(EvalPoolIndicatorDetail::getId).collect(Collectors.toList()); | |
916 | + .eq(EvalPoolIndicatorDetail::getYn, Boolean.TRUE) | |
917 | + .select(EvalPoolIndicatorDetail::getId) | |
918 | + ); | |
919 | + if (PublicUtil.isNotEmpty(oldEvalPoolIndicatorDetails)) { | |
920 | + List<Long> detailIds = oldEvalPoolIndicatorDetails.stream().map(EvalPoolIndicatorDetail::getId).distinct().collect(Collectors.toList()); | |
919 | 921 | evalPoolIndicatorDetailService.removeByIds(detailIds); |
920 | 922 | } |
921 | 923 | evalPoolIndicatorDetailService.insertBatchSomeColumn(indicatorDetails); | ... | ... |