From 5e972eb9928c39b5abbdfd35e2a0aeff40876e7d Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 07 May 2024 17:23:16 +0800
Subject: [PATCH] 修改不成功问题
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/log/mapper/SmLogManageMapper.xml | 49 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 43 insertions(+), 6 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..2f17db8 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
@@ -3,11 +3,22 @@
<mapper namespace="cn.gistack.sm.log.mapper.SmLogManageMapper">
<select id="getAppUserNum" resultType="java.lang.Integer">
SELECT SUM(CASE WHEN useTimes !=0 THEN 1 ELSE 0 END) FROM (
- SELECT COUNT(*) as useTimes
- FROM SM_LOG_MANAGE SLM
- WHERE SLM.SOURCE = 'APP' AND SLM.IS_DELETED = 0
- GROUP BY SLM.CREATE_USER
- )
+ SELECT
+ COUNT(*) as useTimes
+ FROM YWXT.SM_LOG_MANAGE SLM
+ LEFT JOIN YWXT.BLADE_USER BU ON BU.ID = SLM.CREATE_USER
+ LEFT JOIN YWXT.BLADE_DEPT BD ON CAST (BD.ID AS VARCHAR) = BU.DEPT_ID
+ WHERE
+ SLM.SOURCE = 'APP'
+ AND SLM.IS_DELETED = 0
+ AND SLM.CREATE_USER IS NOT NULL
+ <if test="adCode != null and adCode != ''">
+ AND CONCAT(BU.DEPT_ID,BD.AD_CODE) LIKE #{adCode}
+ </if>
+
+ GROUP BY SLM.CREATE_USER
+ )
+
</select>
<select id="getAppStatistics" resultType="cn.gistack.sm.log.vo.AppStatistics">
SELECT COUNT(A.useTime) AS useCount,A.useTime as useTime FROM
@@ -29,7 +40,24 @@
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,
+ L.SM4IV,
+ L.KEYINDEXS,
+ L.MACED,
+ 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 +66,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