fix: 修改bug3

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

@@ -69,6 +69,7 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
@@ -432,8 +433,17 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
 		log.info("当前提交任务类型id：{}", taskTypeId);
 		if (!ArrayUtil.contains(ingTypeIds, taskTypeId)){
 
+			List<String> toCheckTaskTypeIds;
+			if ("15".equals(taskTypeId) || "30".equals(taskTypeId)){
+				toCheckTaskTypeIds = new ArrayList<>(2);
+				toCheckTaskTypeIds.add("15");
+				toCheckTaskTypeIds.add("30");
+			} else {
+				toCheckTaskTypeIds = Collections.singletonList(taskTypeId);
+			}
+
 			R<?> checkPercentRuleResult =
-					wmTaskSubmissionPercentRuleService.checkPercentRule(scorePackage, SecurityUtils.getUser().getDeptId(), null, Collections.singletonList(taskTypeId));
+					wmTaskSubmissionPercentRuleService.checkPercentRule(scorePackage, SecurityUtils.getUser().getDeptId(), null, toCheckTaskTypeIds);
 			if (checkPercentRuleResult.getCode() != 0) {
 				throw new RuntimeException(checkPercentRuleResult.getMsg());
 			}