From bb7971ee1b8dbfaa0e1ceb0d60daee974da77671 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 20 Oct 2023 17:57:31 +0800
Subject: [PATCH] 新增从中台读取数据（按水库和按行政区）
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/log/mapper/SmLogManageMapper.xml | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 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 d0c896a..71045ac 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,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 !=''">
@@ -41,8 +58,11 @@
<if test="vo.source !=null and vo.source !=''">
AND L.SOURCE = #{vo.source}
</if>
- <if test="vo.daterange !=null and vo.daterange.length > 0">
- AND L.CREATE_TIME >= #{vo.daterange[0]} AND L.CREATE_TIME <= #{vo.daterange[1]}
+ <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>
--
Gitblit v1.9.3