From 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 19 Oct 2023 15:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/log/mapper/SmLogManageMapper.xml | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/log/mapper/SmLogManageMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/log/mapper/SmLogManageMapper.xml
index 2e9638b..63e95ce 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/log/mapper/SmLogManageMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/log/mapper/SmLogManageMapper.xml
@@ -29,7 +29,21 @@
GROUP BY A.useTime
</select>
<select id="selectMyPage" resultType="cn.gistack.sm.log.vo.SmLogManageVO">
- SELECT L.*,U.real_name createUserName FROM SM_LOG_MANAGE L
+ SELECT
+ L.ID,
+ L.OPERATION_DESCRIPTION,
+ L.URL,
+ L.IP,
+ L.CREATE_TIME,
+ L.CREATE_USER,
+ L.CREATE_DEPT,
+ L.UPDATE_TIME,
+ L.UPDATE_USER,
+ L.STATUS,
+ L.IS_DELETED,
+ L.SOURCE,
+ U.real_name createUserName
+ FROM SM_LOG_MANAGE L
LEFT JOIN BLADE_USER U ON U.ID = L.CREATE_USER
WHERE L.IS_DELETED = 0
<if test="vo.createUserName !=null and vo.createUserName !=''">
@@ -38,6 +52,15 @@
<if test="vo.operationDescription !=null and vo.operationDescription !=''">
AND L.OPERATION_DESCRIPTION LIKE CONCAT('%',#{vo.operationDescription},'%')
</if>
+ <if test="vo.source !=null and vo.source !=''">
+ AND L.SOURCE = #{vo.source}
+ </if>
+ <if test="vo.startTime !=null and vo.startTime !=''">
+ AND DATE_FORMAT(L.create_time,'%Y-%m-%d') >= #{vo.startTime}
+ </if>
+ <if test="vo.endTime !=null and vo.endTime !=''">
+ AND DATE_FORMAT(L.create_time,'%Y-%m-%d') <= #{vo.endTime}
+ </if>
ORDER BY L.CREATE_TIME DESC
</select>
</mapper>
--
Gitblit v1.9.3