From 9cb78a5414cdbfdd59931b14759bf9800d275448 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 19 五月 2025 14:39:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/TResultWorkEvaluateMapper.xml | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TResultWorkEvaluateMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TResultWorkEvaluateMapper.xml
index ed5338c..394cf09 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TResultWorkEvaluateMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TResultWorkEvaluateMapper.xml
@@ -30,5 +30,28 @@
<sql id="Base_Column_List">
id, dispatch_id, user_id, result_report_id,evaluate_type, evaluate_one, evaluate_two, evaluate_three, evaluate_four, evaluate_five, evaluate_six, status, evaluate_person_id, evaluate_time,result_evaluate_json, create_time, update_time, create_by, update_by, disabled
</sql>
+ <select id="pageList" resultType="com.ruoyi.system.vo.TResultWorkEvaluateVO">
+ select t1.*,t2.team_name as teamName,t2.create_time as startTime from t_result_work_evaluate t1
+ left join t_project_team t2 on t1.team_id = t2.id
+ <where>
+ <if test="query.teamName != null and query.teamName != ''">
+ and t2.team_name like concat('%',#{query.teamName},'%')
+ </if>
+ <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
+ AND t1.create_time BETWEEN #{query.startTime} AND #{query.endTime}
+ </if>
+ <if test="query.status != null">
+ AND t1.audit_status = #{query.auditStatus}
+ </if>
+ <if test="query.teamIds != null and query.teamIds > 0">
+ AND t1.team_id in
+ <foreach collection="query.teamIds" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </if>
+ AND t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+ </where>
+ group by t1.team_id
+ </select>
</mapper>
--
Gitblit v1.7.1