From 519b464e4ed3d07bd5aa23a4067e5869058de2e5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 26 十月 2023 13:36:51 +0800
Subject: [PATCH] 添加统计日志
---
server/src/main/resources/mappers/SystemUserMapper.xml | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/server/src/main/resources/mappers/SystemUserMapper.xml b/server/src/main/resources/mappers/SystemUserMapper.xml
index 4bfdd26..f641d31 100644
--- a/server/src/main/resources/mappers/SystemUserMapper.xml
+++ b/server/src/main/resources/mappers/SystemUserMapper.xml
@@ -73,10 +73,14 @@
<select id="activityLoginVOList" parameterType="doumeemes.dao.ext.dto.ActivityLoginDTO" resultMap="ActivityLoginVO">
<<<<<<< HEAD
+<<<<<<< HEAD
select a.DATA_DATE , count(b.id) as dayActiveUserNum from ( SELECT DATE_FORMAT( DATE_ADD(CONCAT(#{dto.startDate}), INTERVAL(help_topic_id) DAY),'%Y-%m-%d') DATA_DATE
=======
select a.DATA_DATE , count(1) as dayActiveUserNum from ( SELECT DATE_FORMAT( DATE_ADD(CONCAT(#{dto.startDate}), INTERVAL(help_topic_id) DAY),'%Y-%m-%d') DATA_DATE
>>>>>>> 1.0.3
+=======
+ select a.DATA_DATE , count(b.id) as dayActiveUserNum from ( SELECT DATE_FORMAT( DATE_ADD(CONCAT(#{dto.startDate}), INTERVAL(help_topic_id) DAY),'%Y-%m-%d') DATA_DATE
+>>>>>>> dev
FROM mysql.help_topic
WHERE TIMESTAMPDIFF(DAY,CONCAT(#{dto.startDate}),CONCAT(#{dto.endDate})) > help_topic_id ) a
left join
@@ -102,6 +106,7 @@
<where>
s.COMPANY_ID is not null
<<<<<<< HEAD
+<<<<<<< HEAD
and s.SUCCESS = 1
and s.ORGIN is not null
<if test="dto.orgin != null">
@@ -113,6 +118,13 @@
</if>
>>>>>>> 1.0.3
+=======
+ and s.SUCCESS = 1
+ and s.ORGIN is not null
+ <if test="dto.orgin != null">
+ AND s.orgin = #{dto.orgin}
+ </if>
+>>>>>>> dev
<if test="dto.companyName != null and dto.companyName != ''">
AND c.`NAME` LIKE CONCAT('%', #{dto.companyName}, '%')
</if>
--
Gitblit v1.9.3