feat: 任务审核列表-加任务类型下拉条件

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

@@ -18,15 +18,19 @@
 package com.qunzhixinxi.hnqz.admin.controller;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qunzhixinxi.hnqz.admin.entity.WmDaAgent;
 import com.qunzhixinxi.hnqz.admin.entity.WmDaDrugEnt;
+import com.qunzhixinxi.hnqz.admin.entity.WmTask;
 import com.qunzhixinxi.hnqz.admin.entity.WmTaskTypeEntRef;
 import com.qunzhixinxi.hnqz.admin.entity.output.WmTaskTypeDeptOutput;
 import com.qunzhixinxi.hnqz.admin.entity.vo.WmTaskTypeVO;
+import com.qunzhixinxi.hnqz.admin.enums.TaskStatusEnum;
+import com.qunzhixinxi.hnqz.admin.mapper.WmTaskMapper;
 import com.qunzhixinxi.hnqz.admin.service.*;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
@@ -42,6 +46,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.stream.Collectors;
 
 
 /**
@@ -62,6 +67,7 @@ public class WmTaskTypeController {
 	private final WmTaskTypeEntRefService wmTaskTypeEntRefService;
 	private final WmDeptTaskTypeConfigService wmDeptTaskTypeConfigService;
 	private final WmTaskTypeSubCate2Service wmTaskTypeSubCate2Service;
+	private final WmTaskMapper wmTaskMapper;
 
 	/**
 	 * 分页查询
@@ -337,6 +343,26 @@ public class WmTaskTypeController {
 		return R.ok(wmTaskTypeService.list(Wrappers.query(wmDaDrugEnt)));
 	}
 
+	/**
+	 * 查询待审核的任务类型
+	 *
+	 * @param scorePackageId 积分包id
+	 * @return 列表数据
+	 */
+	@GetMapping("/list-package-task-type")
+	public R<?> listPackageTaskType(@RequestParam(value = "scorePackageId") String scorePackageId) {
+		// 获取待审核的任务
+		List<WmTask> wmTasks = wmTaskMapper.selectList(Wrappers.<WmTask>lambdaQuery()
+				.select(WmTask::getTaskTypeId)
+				.eq(WmTask::getScorePackageId, scorePackageId)
+				.eq(WmTask::getTaskStatus, TaskStatusEnum.UNDER_REVIEW.val()));
+		if (CollUtil.isEmpty(wmTasks)) {
+			return R.ok(Collections.emptyList());
+		}
+		Set<String> taskTypes = wmTasks.stream().map(WmTask::getTaskTypeId).collect(Collectors.toSet());
+		return R.ok(wmTaskTypeService.listByIds(taskTypes));
+	}
+
 	/**
 	 * 获取药企列表
 	 *

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmTaskMapper.xml

@@ -998,6 +998,9 @@
 		<if test="query.taskUserId!=null and query.taskUserId!=''">
 			and  t.task_user_id = #{query.taskUserId}
 		</if>
+		<if test="query.taskTypeId != null">
+			and  t.task_type_id = #{query.taskTypeId}
+		</if>
 		order by t.lookinto_date
 
 	</select>