fix: 批量审核, 过滤掉审核不通过的

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmScorePackageStatusController.java

@@ -200,29 +200,32 @@ public class WmScorePackageStatusController {
 	@GetMapping(value = "/approvalStatus/checkout")
 	public R approvalStatusCheckout(@RequestParam(value = "ids") String ids){
 
+		// 获取id
 		List<String> idList = StrUtil.split(ids, StrUtil.COMMA);
 		List<Integer> idListInt = idList.stream().mapToInt(Integer::valueOf).boxed().collect(Collectors.toList());
 
-
+		// 获取待审核的记录
 		List<WmScorePackageStatus> wmScorePackageStatuses = wmScorePackageStatusService.list(Wrappers.<WmScorePackageStatus>lambdaQuery()
 				.in(WmScorePackageStatus::getId, idList));
 
-
+		// 过滤出待审核的积分包id
 		Set<String> packageIds = wmScorePackageStatuses.stream()
 				.map(WmScorePackageStatus::getPackageId)
 				.collect(Collectors.toSet());
 
+		// 获取积分包信息,主要是为了获取接单对象
 		List<WmScorePackage> packageList = wmScorePackageService.list(Wrappers.<WmScorePackage>lambdaQuery()
 				.in(WmScorePackage::getId, packageIds));
 
+		// 封装每个积分包对应的接单人数
 		Map<String, Integer> userNumMap = packageList.stream()
 				.collect(Collectors.toMap(WmScorePackage::getId, WmScorePackage::getUserNum));
 
-
+		// 查询所有积分包的领包记录(过滤掉领包不通过的, 审核状态：1.审核中，2.审核通过，3.审核不通过), 只包含审核通过和待审核
 		List<WmScorePackageStatus> packageStatuses = wmScorePackageStatusService.list(Wrappers.<WmScorePackageStatus>lambdaQuery()
-				.in(WmScorePackageStatus::getPackageId, packageIds));
-
+				.in(WmScorePackageStatus::getPackageId, packageIds)).stream().filter(ps -> !StrUtil.equals("3", ps.getStatus())).collect(Collectors.toList());
 
+		// 按照积分包id分组, 审核记录
 		Map<String, List<WmScorePackageStatus>> map = packageStatuses.stream()
 				.collect(Collectors.groupingBy(WmScorePackageStatus::getPackageId));