Преглед на файлове

feat: 批量审批去除部分校验

李学松 преди 2 години
родител
ревизия
18b37617d2

+ 0 - 7
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmReportServiceImpl.java

@@ -561,7 +561,6 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 
 		// 批量查询积分包
 		List<WmScorePackage> taskScorePackages = wmScorePackageService.listByIds(scorePackageIds);
-		Map<String, WmScorePackage> scorePackageMap = taskScorePackages.stream().collect(Collectors.toMap(WmScorePackage::getId, Function.identity()));
 
 		// 查询企业对应的积分包
 		Integer reportScorePackageId = queryReport.getScoreId();
@@ -574,12 +573,6 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 				throw new RuntimeException("任务不存在");
 			}
 
-			WmScorePackage taskScorePackage = scorePackageMap.get(queryTask.getScorePackageId());
-			if (!StrUtil.equals(ScorePackageStatusEnum.IN_PROGRESS.val(), taskScorePackage.getScorePackageStatus())
-					&& !StrUtil.equals(ScorePackageStatusEnum.TO_BE_APPROVAL.val(), taskScorePackage.getScorePackageStatus())) {
-				throw new RuntimeException("积分包状态不支持审核");
-			}
-
 			// STEP1: 更新任务企业审核状态
 			LambdaUpdateWrapper<WmTask> updateTaskWrapper = new LambdaUpdateWrapper<>();
 			updateTaskWrapper.eq(WmTask::getId, id);

+ 0 - 4
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmTaskServiceImpl.java

@@ -2659,10 +2659,6 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
 		// 批量查询积分包
 		WmScorePackage wmScorePackage = wmScorePackageService.getById(scorePackageId);
 
-		if (!StrUtil.equals(ScorePackageStatusEnum.IN_PROGRESS.val(), wmScorePackage.getScorePackageStatus())) {
-			throw new RuntimeException("积分包状态不支持审核");
-		}
-
 		idList.forEach(id -> {
 			// 查询这条任务
 			WmTask queryTask = taskMap.get(id);