Merge branch 'feat-batchpackage-20211118' into master

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackageStatusServiceImpl.java

@@ -439,19 +439,24 @@ public class WmScorePackageStatusServiceImpl extends ServiceImpl<WmScorePackageS
 						.map(Integer::parseInt)
 						.collect(Collectors.toList());
 
-		Map<String, List<WmScorePackageStatus>> collect = this.listByIds(idList).stream().collect(Collectors.groupingBy(WmScorePackageStatus::getPackageId));
+		List<String> packageIds = this.listByIds(idList).stream().map(WmScorePackageStatus::getPackageId).distinct().collect(Collectors.toList());
+
+		Map<String, List<WmScorePackageStatus>> collect = this.list(Wrappers.<WmScorePackageStatus>lambdaQuery().in(WmScorePackageStatus::getPackageId,packageIds))
+				.stream().collect(Collectors.groupingBy(WmScorePackageStatus::getPackageId));
 
 		int operation = 0;
 		int remain = 0;
 		for (Map.Entry<String, List<WmScorePackageStatus>> entity : collect.entrySet()){
 
-			List<WmScorePackageStatus> val = entity.getValue();
+			List<WmScorePackageStatus> val = entity.getValue().stream().filter(scorePackageStatus -> !StrUtil.equals("3", scorePackageStatus.getStatus())).collect(Collectors.toList());
 
 			if (val.size() > 1){
 				remain++;
 				if (WmScorePackageStatusBatch.ApprovalStatus.REJECTED.equals(statusBatch.getStatus())){
 					for (WmScorePackageStatus status : val){
-						oneByOne(status, statusBatch.getStatus());
+						if (idList.contains(status.getId())){
+							oneByOne(status, statusBatch.getStatus());
+						}
 					}
 				}
 			} else {