From ce0651907f18a57dae80065e01589e975530f53e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 20 五月 2025 18:52:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/TProjectApprovalReportMapper.xml | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TProjectApprovalReportMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TProjectApprovalReportMapper.xml
index 57cb959..4916193 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TProjectApprovalReportMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TProjectApprovalReportMapper.xml
@@ -24,5 +24,38 @@
<sql id="Base_Column_List">
id, team_id, report_code, report_name, report_text, status, audit_person_id, audit_time, audit_remark, create_time, update_time, create_by, update_by, disabled
</sql>
+ <select id="pageList" resultType="com.ruoyi.system.vo.TProjectApprovalReportVO">
+ select id, team_id, report_code, report_name, report_text, status, audit_person_id, audit_time, audit_remark, create_time, update_time, create_by, update_by, disabled
+ from t_project_approval_report tpar
+ left join t_project_team tpt on tpt.id = tpar.team_id
+ <where>
+ <if test="query.teamIds != null and query.teamIds.size() > 0">
+ and tpt.id in
+ <foreach item="item" collection="query.teamIds" separator="," open="(" close=")" index="">
+ #{item}
+ </foreach>
+ </if>
+ <if test="query.teamName != null and query.teamName != ''">
+ and tpt.team_name like concat('%',#{query.teamName},'%')
+ </if>
+ <if test="query.reportCode != null and query.reportCode != ''">
+ and tpar.report_code like concat('%',#{query.reportCode},'%')
+ </if>
+ <if test="query.reportName != null and query.reportName != ''">
+ and tpar.report_name like concat('%',#{query.reportName},'%')
+ </if>
+ <if test="query.status != null and query.status != -1">
+ and tpar.status = #{query.status}
+ </if>
+ <if test="query.status == null">
+ and tpar.status != -1
+ </if>
+ <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
+ AND tpar.create_time BETWEEN #{query.startTime} AND #{query.endTime}
+ </if>
+ AND tpar.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+ </where>
+ ORDER BY tpar.create_time DESC
+ </select>
</mapper>
--
Gitblit v1.7.1