feat: 企业任务类型同步启用、停用状态3

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

@@ -1027,6 +1027,7 @@ public class ApiController {
 	@SysLog("新增任务内容表")
 	@PostMapping("/saveTaskContent")
 	public R<?> saveTaskContent(@RequestBody WmTaskContent wmTaskContent) {
+		log.info("saveTaskContent入参：{}", wmTaskContent);
 		Set<String> errorHash = new HashSet<>();
 		List<String> ducImgUrl = new ArrayList<>();
 		List<String> all = new ArrayList<>();

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

@@ -517,20 +517,6 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
 
 		List<WmScorePackageStatus> statusList = checkPackageStatus(sysU.getUserId(), tWmScorePackage.getId());
 
-		// 校验任务类型是否启用
-		WmTaskType _baseTaskType = wmTaskTypeService.getById(wmTaskContent.getTemp30());
-		WmTaskType queryTaskType = new WmTaskType();
-		queryTaskType.setRuleId(tWmScorePackage.getRuleId());
-		queryTaskType.setTaskTypeName(_baseTaskType.getTaskTypeName());
-		queryTaskType.setDelFlag("0");
-		List<WmTaskType> deptTaskTypes = wmTaskTypeService.list(Wrappers.query(queryTaskType));
-		if (CollUtil.isEmpty(deptTaskTypes)) {
-			throw new RuntimeException(_baseTaskType.getTaskTypeName() + "任务类型不存在");
-		}
-		if (EnableEnum.DISABLE.val().equals(deptTaskTypes.get(0).getEnableFlag())) {
-			throw new RuntimeException(_baseTaskType.getTaskTypeName() + "任务类型已停用");
-		}
-
 		// 检验分值 3W
 		this.limitScore(sysU.getUserId(), tWmScorePackage.getPackageType1());
 
@@ -642,6 +628,20 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
 					wmTask.setTaskTypeId(taskTypeId);
 				}
 
+				// 校验任务类型是否启用
+				WmTaskType _baseTaskType = wmTaskTypeService.getById(wmTaskContent.getTemp30());
+				WmTaskType queryTaskType = new WmTaskType();
+				queryTaskType.setRuleId(tWmScorePackage.getRuleId());
+				queryTaskType.setTaskTypeName(_baseTaskType.getTaskTypeName());
+				queryTaskType.setDelFlag("0");
+				List<WmTaskType> deptTaskTypes = wmTaskTypeService.list(Wrappers.query(queryTaskType));
+				if (CollUtil.isEmpty(deptTaskTypes)) {
+					throw new RuntimeException(_baseTaskType.getTaskTypeName() + "任务类型不存在");
+				}
+				if (EnableEnum.DISABLE.val().equals(deptTaskTypes.get(0).getEnableFlag())) {
+					throw new RuntimeException(_baseTaskType.getTaskTypeName() + "任务类型已停用");
+				}
+
 				log.info("获取任务得分：{}", score);
 
 				if (score < 0) {