From 68a37e86d0bfa43e9d4aa0379f47eecee7a0b9c1 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期一, 01 四月 2024 16:07:24 +0800
Subject: [PATCH] xml位置修改
---
ycl-server/src/main/resources/mapper/zgyw/DefaultAuditingMapper.xml | 40 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 39 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..fb8674c 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/DefaultAuditingMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/DefaultAuditingMapper.xml
@@ -6,11 +6,49 @@
<resultMap id="BaseResultMap" type="com.ycl.platform.domain.vo.DefaultAuditingVO">
<result column="id" property="id" />
<result column="create_time" property="createTime" />
+ <result column="score" property="score" />
+ <result column="check_publish_id" property="checkPublishId" />
<result column="default_id" property="defaultId" />
<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" />
+ <result column="create_by" property="createBy" />
</resultMap>
+ <select id="page" resultMap="BaseResultMap">
+ SELECT
+ tda.id,
+ tda.score,
+ tda.check_publish_id,
+ tda.create_time,
+ tda.default_id,
+ tda.auditing_status,
+ tda.remark,
+ tda.auditing_time,
+ tda.auditing_user,
+ su.nick_name,
+ tda.create_by,
+ (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