feat: 任务类型百分比限制-提交任务、打卡时限制

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

@@ -45,6 +45,7 @@ import com.qunzhixinxi.hnqz.admin.service.WmScorePackageService;
 import com.qunzhixinxi.hnqz.admin.service.WmScorePackageStatusService;
 import com.qunzhixinxi.hnqz.admin.service.WmTaskContentService;
 import com.qunzhixinxi.hnqz.admin.service.WmTaskService;
+import com.qunzhixinxi.hnqz.admin.service.WmTaskSubmissionPercentRuleService;
 import com.qunzhixinxi.hnqz.admin.service.WmTaskSubmissionRuleService;
 import com.qunzhixinxi.hnqz.admin.service.WmTaskTypeService;
 import com.qunzhixinxi.hnqz.admin.service.WmTaskTypeSubCategoryService;
@@ -91,6 +92,7 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
 	private final SysPublicParamService sysPublicParamService;
 	private final WmTaskTypeSubCategoryService taskTypeSubCategoryService;
 	private final WmTaskSubmissionRuleService taskSubmissionRuleService;
+	private final WmTaskSubmissionPercentRuleService wmTaskSubmissionPercentRuleService;
 
 
 	private static final DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
@@ -902,22 +904,28 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
 		}
 
 		// 医院信息收集、医院信息修改两类任务做的任务总积分不得大于积分包值的60%（积分包值小于5000不做限制）
-		if ("15".equals(wmTaskContent.getTemp30()) || "30".equals(wmTaskContent.getTemp30())) {
-			if (scorePackage.getScore() > 5000) {
-				List<WmTask> wmTaskList = wmTaskService.list(Wrappers.<WmTask>lambdaQuery()
-						.eq(WmTask::getRealFlag, "0")
-						.eq(WmTask::getDelFlag, DelEnum.NOT_DEL.val())
-						.in(WmTask::getScorePackageId, scorePackage.getId())
-						.in(WmTask::getTaskTypeId, "15", "30")
-						.ne(WmTask::getTaskStatus, "4"));
-				if (CollectionUtil.isNotEmpty(wmTaskList)) {
-					int totalScore = scorePackage.getScore();
-					int partScore = wmTaskList.stream().mapToInt(WmTask::getScore).sum();
-					if (partScore * 1.0 / totalScore > 0.6) {
-						throw new RuntimeException("医院信息收集、医院信息修改两类任务总积分不得大于积分包值的60%");
-					}
-				}
-			}
+//		if ("15".equals(wmTaskContent.getTemp30()) || "30".equals(wmTaskContent.getTemp30())) {
+//			if (scorePackage.getScore() > 5000) {
+//				List<WmTask> wmTaskList = wmTaskService.list(Wrappers.<WmTask>lambdaQuery()
+//						.eq(WmTask::getRealFlag, "0")
+//						.eq(WmTask::getDelFlag, DelEnum.NOT_DEL.val())
+//						.in(WmTask::getScorePackageId, scorePackage.getId())
+//						.in(WmTask::getTaskTypeId, "15", "30")
+//						.ne(WmTask::getTaskStatus, "4"));
+//				if (CollectionUtil.isNotEmpty(wmTaskList)) {
+//					int totalScore = scorePackage.getScore();
+//					int partScore = wmTaskList.stream().mapToInt(WmTask::getScore).sum();
+//					if (partScore * 1.0 / totalScore > 0.6) {
+//						throw new RuntimeException("医院信息收集、医院信息修改两类任务总积分不得大于积分包值的60%");
+//					}
+//				}
+//			}
+//		}
+		// 校验任务百分比限制规则（如果积分包值大于【任务配置】-【百分比限制】配置的起始值，
+		// 且【任务配置】-【百分比限制】所选的任务类型对应的任务总完成积分值>积分包值*【任务配置】-【百分比限制】配置的百分比，则校验不通过）
+		R<?> checkPercentRuleResult = wmTaskSubmissionPercentRuleService.checkPercentRule(scorePackage, SecurityUtils.getUser().getDeptId());
+		if (checkPercentRuleResult.getCode() != 0) {
+			throw new RuntimeException(checkPercentRuleResult.getMsg());
 		}
 
 		// 校验医院信息修改的任务（同一家医院，同一个人一个月只能修改一次，该医院一个月最多可修改3次）

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

@@ -1,20 +1,28 @@
 package com.qunzhixinxi.hnqz.admin.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskSubmissionPercentRule;
 import com.qunzhixinxi.hnqz.admin.entity.WmScorePackage;
 import com.qunzhixinxi.hnqz.admin.entity.WmTask;
+import com.qunzhixinxi.hnqz.admin.entity.WmTaskType;
 import com.qunzhixinxi.hnqz.admin.enums.DelEnum;
 import com.qunzhixinxi.hnqz.admin.mapper.WmTaskSubmissionPercentRuleMapper;
 import com.qunzhixinxi.hnqz.admin.service.WmTaskService;
 import com.qunzhixinxi.hnqz.admin.service.WmTaskSubmissionPercentRuleService;
+import com.qunzhixinxi.hnqz.admin.service.WmTaskTypeService;
 import com.qunzhixinxi.hnqz.common.core.constant.enums.CommonFlag;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
 
 /**
  * 任务提交百分比规则
@@ -30,6 +38,8 @@ public class WmTaskSubmissionPercentRuleServiceImpl
 
 	private final WmTaskService wmTaskService;
 
+	private final WmTaskTypeService wmTaskTypeService;
+
 	/**
 	 * 校验任务百分比限制规则（达到要求的积分包，【任务配置】-【百分比限制】所选的任务总完成积分值不得大于积分包值*百分比）
 	 *
@@ -39,21 +49,57 @@ public class WmTaskSubmissionPercentRuleServiceImpl
 	@Override
 	public R<?> checkPercentRule(WmScorePackage scorePackage, Integer deptId) {
 
+		AtomicBoolean failFlag = new AtomicBoolean(false);
+		AtomicReference<String> message = new AtomicReference<>("");
+
 		// 查询配置的百分比规则
 		List<WmTaskSubmissionPercentRule> percentRules = this.list(Wrappers.<WmTaskSubmissionPercentRule>lambdaQuery()
 				.eq(WmTaskSubmissionPercentRule::getDeptId, deptId)
 				.eq(WmTaskSubmissionPercentRule::getOptFlag, CommonFlag.OptFlag.OK));
 
-		percentRules.forEach(percentRule -> {
-			List<WmTask> wmTaskList = wmTaskService.list(Wrappers.<WmTask>lambdaQuery()
-					.eq(WmTask::getRealFlag, "0")
-					.eq(WmTask::getDelFlag, DelEnum.NOT_DEL.val())
-					.in(WmTask::getScorePackageId, scorePackage.getId())
-					.in(WmTask::getTaskTypeId, "15", "30")
-					.ne(WmTask::getTaskStatus, "4"));
+		// 根据batchId分组
+		Map<String, List<WmTaskSubmissionPercentRule>> batchRules = percentRules.stream().collect(Collectors.groupingBy(WmTaskSubmissionPercentRule::getBatchId));
+
+		// 查询taskType
+		List<WmTaskType> taskTypeList = wmTaskTypeService.list(Wrappers.<WmTaskType>lambdaQuery()
+				.eq(WmTaskType::getTaskTypeLevel, "1")
+				.eq(WmTaskType::getDelFlag, "0")
+				.eq(WmTaskType::getEnableFlag, "0"));
+		// taskType通过id分组（key为parentId，value为taskTypeId的set）
+		Map<String, String> taskTypeIdMap = taskTypeList.stream()
+				.collect(Collectors.toMap(WmTaskType::getId, WmTaskType::getTaskTypeName));
+
+		batchRules.forEach((batchId, rules) -> {
+
+			// 获取该分组下所有taskTypeId
+			List<String> allTaskTypeIds = rules.stream()
+					.flatMap(percentRule -> Arrays.stream(percentRule.getRule().getTaskTypeIds()))
+					.collect(Collectors.toList());
+
+			WmTaskSubmissionPercentRule.PercentRule rule = rules.get(0).getRule();
+
+			// 指定任务类型做的任务总积分不得大于积分包值的rule.limitPercent%（积分包值小于rule.startScore不做限制）
+			if (scorePackage.getScore() > rule.getStartScore()) {
+				List<WmTask> wmTaskList = wmTaskService.list(Wrappers.<WmTask>lambdaQuery()
+						.eq(WmTask::getRealFlag, "0")
+						.eq(WmTask::getDelFlag, DelEnum.NOT_DEL.val())
+						.in(WmTask::getScorePackageId, scorePackage.getId())
+						.in(WmTask::getTaskTypeId, allTaskTypeIds)
+						.ne(WmTask::getTaskStatus, "4"));
+
+				if (CollectionUtil.isNotEmpty(wmTaskList)) {
+					int totalScore = scorePackage.getScore();
+					int partScore = wmTaskList.stream().mapToInt(WmTask::getScore).sum();
+					if (partScore * 100.0 / totalScore > Float.parseFloat(rule.getLimitPercent())) {
+						failFlag.set(true);
+
+						String taskTypeNames = allTaskTypeIds.stream().map(taskTypeIdMap::get).collect(Collectors.joining("、"));
+						message.set(String.format("%s任务类型的任务总积分不得大于积分包值的%s", taskTypeNames, rule.getLimitPercent()));
+					}
+				}
+			}
 		});
-		// TODO
 
-		return null;
+		return failFlag.get() ? R.failed(null, message.get()) : R.ok();
 	}
 }

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

@@ -51,6 +51,7 @@ public class WmUserSignServiceImpl extends ServiceImpl<WmUserSignMapper, WmUserS
 	private final SysPublicParamService sysPublicParamService;
 	private final WmDeptTaskTypeTemplateService wmDeptTaskTypeTemplateService;
 	private final WmUserSignDetailService wmUserSignDetailService;
+	private final WmTaskSubmissionPercentRuleService wmTaskSubmissionPercentRuleService;
 	private final UpmsConfig upmsConfig;
 
 	@Override
@@ -241,6 +242,13 @@ public class WmUserSignServiceImpl extends ServiceImpl<WmUserSignMapper, WmUserS
 
 		}
 
+		// 校验任务百分比限制规则（如果积分包值大于【任务配置】-【百分比限制】配置的起始值，
+		// 且【任务配置】-【百分比限制】所选的任务类型对应的任务总完成积分值>积分包值*【任务配置】-【百分比限制】配置的百分比，则校验不通过）
+		R<?> checkPercentRuleResult = wmTaskSubmissionPercentRuleService.checkPercentRule(tWmScorePackage, SecurityUtils.getUser().getDeptId());
+		if (checkPercentRuleResult.getCode() != 0) {
+			throw new RuntimeException(checkPercentRuleResult.getMsg());
+		}
+
 		/**
 		 * 积分包领取明细
 		 */