From 572df690f72ed4a077d934823f261dec39b3cc7d Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期二, 08 九月 2026 17:11:34 +0800
Subject: [PATCH] feat&bug：文档内容修改
---
cloud-server-account/src/main/resources/mapper/TAppUserMapper.xml | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/cloud-server-account/src/main/resources/mapper/TAppUserMapper.xml b/cloud-server-account/src/main/resources/mapper/TAppUserMapper.xml
index 3e06e1f..d87c0de 100644
--- a/cloud-server-account/src/main/resources/mapper/TAppUserMapper.xml
+++ b/cloud-server-account/src/main/resources/mapper/TAppUserMapper.xml
@@ -71,8 +71,8 @@
#{id}
</foreach>
</if>
- and t1.state != 3
</where>
+ order by t1.insertTime desc, t1.id desc
</select>
<select id="getSelects" resultType="com.dsh.account.dto.SelectDto">
SELECT ts.id ,ts.`name` as value
@@ -100,6 +100,7 @@
<select id="getYearUserCount" resultType="com.dsh.account.vo.entity.YearData">
select IFNULL(count(*),0) AS yearCount,DATE_FORMAT(insertTime,'%Y') AS `year` from t_app_user
<where>
+ AND state != 3
<if test="dto.cityCode != null and dto.cityCode != ''">
AND cityCode = #{dto.cityCode}
</if>
@@ -120,6 +121,7 @@
<select id="getMonthUserCount" resultType="com.dsh.account.vo.entity.MonthData">
select IFNULL(count(*),0) AS monthCount,DATE_FORMAT(insertTime,'%Y%m') AS `month` from t_app_user
<where>
+ AND state != 3
<if test="dto.cityCode != null and dto.cityCode != ''">
AND cityCode = #{dto.cityCode}
</if>
@@ -140,6 +142,7 @@
<select id="getWeekUserCount4" resultType="com.dsh.account.vo.entity.WeekData">
select IFNULL(count(*),0) AS weekCount,4 AS `week` from t_app_user
<where>
+ AND state != 3
<if test="dto.startTime != null and dto.startTime != '' and dto.endTime != null and dto.endTime != ''">
AND insertTime between #{dto.startTime} and #{dto.endTime}
</if>
@@ -163,6 +166,7 @@
<select id="getWeekUserCount3" resultType="com.dsh.account.vo.entity.WeekData">
select IFNULL(count(*),0) AS weekCount,3 AS `week` from t_app_user
<where>
+ AND state != 3
<if test="dto.startTime != null and dto.startTime != '' and dto.endTime != null and dto.endTime != ''">
AND insertTime between #{dto.startTime} and #{dto.endTime}
</if>
@@ -186,6 +190,7 @@
<select id="getWeekUserCount2" resultType="com.dsh.account.vo.entity.WeekData">
select IFNULL(count(*),0) AS weekCount,2 AS `week` from t_app_user
<where>
+ AND state != 3
<if test="dto.startTime != null and dto.startTime != '' and dto.endTime != null and dto.endTime != ''">
AND insertTime between #{dto.startTime} and #{dto.endTime}
</if>
@@ -209,6 +214,7 @@
<select id="getWeekUserCount1" resultType="com.dsh.account.vo.entity.WeekData">
select IFNULL(count(*),0) AS weekCount,1 AS `week` from t_app_user
<where>
+ AND state != 3
<if test="dto.startTime != null and dto.startTime != '' and dto.endTime != null and dto.endTime != ''">
AND insertTime between #{dto.startTime} and #{dto.endTime}
</if>
@@ -232,6 +238,7 @@
<select id="getDayUserCount" resultType="com.dsh.account.vo.entity.DayData">
select IFNULL(count(*),0) AS dayCount,DATE_FORMAT(insertTime,'%Y-%m-%d') AS `day` from t_app_user
<where>
+ AND state != 3
<if test="dto.startTime != null and dto.startTime != '' and dto.endTime != null and dto.endTime != ''">
AND insertTime between #{dto.startTime} and #{dto.endTime}
</if>
@@ -255,6 +262,7 @@
<select id="groupCityInfo" resultType="com.dsh.account.vo.GroupCityInfoVO">
select IFNULL(count(*),0) AS userCount,cityCode,city from t_app_user
<where>
+ AND state != 3
<if test="dto.startTime != null and dto.startTime != '' and dto.endTime != null and dto.endTime != ''">
AND insertTime between #{dto.startTime} and #{dto.endTime}
</if>
@@ -302,7 +310,7 @@
<if test="query.salesmanUser!=null and query.salesmanUser!= ''">
and t2.salesmanUserId = #{query.salesmanUser}
</if>
- and t2.state != 3
</where>
+ order by t2.insertTime desc, t2.id desc
</select>
</mapper>
--
Gitblit v1.7.1