From a4e42a8ba7f1e129aacff98d1e1de2f7a4e41804 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 19 Jun 2023 14:06:46 +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 | 17 ++++++++++++++++-
1 files changed, 16 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 a6e5403..0400a08 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
@@ -16,7 +16,7 @@
COUNT(*),
to_char(create_time,'yyyy-mm-dd') AS useTime,
CREATE_USER
- FROM SK002.SM_LOG_MANAGE
+ FROM SM_LOG_MANAGE
WHERE IS_DELETED = 0 AND SOURCE = 'APP'
<if test="vo.startTime !=null and vo.startTime !=''">
AND DATE_FORMAT(create_time,'%Y-%m-%d') >= #{vo.startTime}
@@ -28,4 +28,19 @@
) A
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
+ LEFT JOIN BLADE_USER U ON U.ID = L.CREATE_USER
+ WHERE L.IS_DELETED = 0
+ <if test="vo.createUserName !=null and vo.createUserName !=''">
+ AND U.REAL_NAME LIKE CONCAT('%',#{vo.createUserName},'%')
+ </if>
+ <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>
+ ORDER BY L.CREATE_TIME DESC
+ </select>
</mapper>
--
Gitblit v1.9.3