feat: 审核页面加任务编号

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

@@ -396,12 +396,12 @@ public class WmReportController {
 	 */
 	@ApiOperation(value = "分页查询", notes = "分页查询")
 	@GetMapping("/getTaskListPage" )
-	public R getTaskListPage(Page page, WmReport wmReport, Integer isApprovalPage, String taskTypeId) {
+	public R getTaskListPage(Page page, WmReport wmReport, Integer isApprovalPage, String taskTypeId, String taskNumber) {
 		WmReport wmReport1=wmReportService.getById(wmReport.getId());
 		if(null==wmReport1){
 			return R.failed("未查询到报告信息");
 		}
-		return wmReportService.getTaskListPage(page,wmReport1, isApprovalPage, taskTypeId);
+		return wmReportService.getTaskListPage(page,wmReport1, isApprovalPage, taskTypeId, taskNumber);
 	}
 
 	/**

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

@@ -73,7 +73,7 @@ public interface WmReportService extends IService<WmReport> {
 	 */
 	R<?> approvalReportByTaskType(List<String> taskIds, String approvalOpinion, String approvalInfo);
 
-	R getTaskListPage(Page page, WmReport wmReport, Integer isApprovalPage, String taskTypeId);
+	R getTaskListPage(Page page, WmReport wmReport, Integer isApprovalPage, String taskTypeId, String taskNumber);
 
 	/**
 	 * 根据积分包id查询待审核任务详情列表

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

@@ -26,7 +26,6 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -56,7 +55,6 @@ import com.qunzhixinxi.hnqz.admin.entity.dto.WmDeptTaskTypeConfigJsonDTO;
 import com.qunzhixinxi.hnqz.admin.entity.vo.WmTaskVO;
 import com.qunzhixinxi.hnqz.admin.enums.DelEnum;
 import com.qunzhixinxi.hnqz.admin.enums.EnableEnum;
-import com.qunzhixinxi.hnqz.admin.enums.PackageFinishStatusEnum;
 import com.qunzhixinxi.hnqz.admin.enums.PackageStatusEnum;
 import com.qunzhixinxi.hnqz.admin.enums.ReportEnum;
 import com.qunzhixinxi.hnqz.admin.enums.ScorePackageStatusEnum;
@@ -959,19 +957,19 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 	}
 
 	/**
-	 * 报告管理--查看
-	 *
-	 * @param page
-	 * @param wmReport
-	 * @param isApprovalPage 1审批，0查看
-	 * @param taskTypeId
-	 * @return
-	 */
+     * 报告管理--查看
+     *
+     * @param page
+     * @param wmReport
+     * @param isApprovalPage 1审批，0查看
+     * @param taskTypeId 任务类型id
+     * @param taskNumber 任务编号
+     * @return
+     */
 	@Override
-	public R getTaskListPage(Page page, WmReport wmReport, Integer isApprovalPage, String taskTypeId) {
+	public R getTaskListPage(Page page, WmReport wmReport, Integer isApprovalPage, String taskTypeId, String taskNumber) {
 		Page pages=null;
 		WmScorePackage scorePackage=wmScorePackageService.getById(wmReport.getScoreId());
-		WmTask wmTask=new WmTask();
 		LambdaQueryWrapper<WmTask> lambdaQueryWrapper= Wrappers.<WmTask>query().lambda();
 		lambdaQueryWrapper.and(wrapper -> wrapper.eq(WmTask::getReportDrugId, wmReport.getId())
 				.or().eq(WmTask::getReportOneId, wmReport.getId())
@@ -986,6 +984,9 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 				lambdaQueryWrapper.and(wrapper -> wrapper.isNull(WmTask::getReportOneApprovalOpinion));
 			}
 		}
+		if (StrUtil.isNotBlank(taskNumber)) {
+			lambdaQueryWrapper.like(WmTask::getTaskNumber, taskNumber);
+		}
 		if (StrUtil.isNotBlank(taskTypeId)) {
 			lambdaQueryWrapper.eq(WmTask::getTaskTypeId, taskTypeId);
 		}

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

@@ -25,6 +25,7 @@
 
 	<resultMap id="wmTaskMap" type="com.qunzhixinxi.hnqz.admin.entity.WmTask">
 		<id property="id" column="id"/>
+		<result property="taskNumber" column="task_number"/>
 		<result property="taskTypeId" column="task_type_id"/>
 		<result property="taskRuleId" column="task_rule_id"/>
 		<result property="score" column="score"/>
@@ -944,6 +945,7 @@
 	<select id="getWmTaskList" resultMap="wmTaskMap">
 		SELECT
 		t.id AS id,
+		t.task_number,
 		t.task_rule_id AS task_rule_id,
 		t.score AS score,
 		p2.id AS score_package_drug_id,
@@ -1004,6 +1006,9 @@
 		<if test="query.taskUserId!=null and query.taskUserId!=''">
 			and  t.task_user_id = #{query.taskUserId}
 		</if>
+		<if test="query.taskNumber != null and query.taskNumber != ''">
+			and t.task_number like concat('%', #{query.taskNumber}, '%')
+		</if>
 		<if test="query.taskTypeId != null and query.taskTypeId != ''">
 			and  t.task_type_id = #{query.taskTypeId}
 		</if>