From 800be390ac246656b4f8d5803cfbb7602c476c4b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 07 三月 2024 10:44:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/DefaultAuditingMapper.xml | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/DefaultAuditingMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/DefaultAuditingMapper.xml
index bf1ba09..49132a1 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/DefaultAuditingMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/DefaultAuditingMapper.xml
@@ -10,7 +10,39 @@
<result column="auditing_status" property="auditingStatus" />
<result column="remark" property="remark" />
<result column="auditing_time" property="auditingTime" />
- <result column="auditing_user" property="auditingUser" />
+ <result column="nick_name" property="auditingUserName" />
+ <result column="rule_name" property="defaultRuleName" />
+ <result column="unit_name" property="unitName" />
</resultMap>
+ <select id="page" resultMap="BaseResultMap">
+ SELECT
+ tda.id,
+ tda.create_time,
+ tda.default_id,
+ tda.auditing_status,
+ tda.remark,
+ tda.auditing_time,
+ tda.auditing_user,
+ su.nick_name,
+ (SELECT unit_name FROM t_yw_unit WHERE id = tdr.unit_id AND deleted = 0) as unit_name,
+ (SELECT rule_name FROM t_default_rule WHERE id = tdr.default_rule_id AND deleted = 0) as rule_name
+ FROM
+ t_default_auditing tda
+ INNER JOIN t_default_record tdr ON tda.default_id = tdr.id AND tda.deleted = 0 AND tdr.deleted = 0
+ LEFT JOIN sys_user su ON tda.auditing_user = su.user_id
+ <where>
+
+ <if test="query.unitId != null and query.unitId != ''">
+ AND tdr.unit_id = #{query.unitId}
+ </if>
+ <if test="query.auditingStartTime != null and query.auditingEndTime != null">
+ AND tda.auditing_time BETWEEN #{query.auditingStartTime} AND #{query.auditingEndTime}
+ </if>
+ <if test="query.createStartTime != null and query.createEndTime != null">
+ AND tda.create_time BETWEEN #{query.createStartTime} AND #{query.createEndTime}
+ </if>
+ </where>
+ </select>
+
</mapper>
--
Gitblit v1.8.0