From 63ab5bdc854313abacd411af75e03ad262699af4 Mon Sep 17 00:00:00 2001
From: xiezhijun <15270898033@163.com>
Date: Wed, 24 Mar 2021 18:36:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=A1=E6=8E=A5=E5=8F=A3sql?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/custom/SysWxUserInfoMapper.xml      |  6 ++----
 .../mapper/custom/SysWxUserLogMapper.xml       | 18 +++++++++++++++++-
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysWxUserInfoMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysWxUserInfoMapper.xml
index 98cae17fc..5ccfddf05 100644
--- a/stdiet-custom/src/main/resources/mapper/custom/SysWxUserInfoMapper.xml
+++ b/stdiet-custom/src/main/resources/mapper/custom/SysWxUserInfoMapper.xml
@@ -38,10 +38,8 @@
     <select id="selectSysWxUserInfoListNot" parameterType="SysWxUserInfo" resultMap="SysWxUserInfoResult">
         select distinct wxuser.openid, wxuser.nick_name, wxuser.appid, wxuser.phone, wxuser.avatar_url, wxuser.sex, wxuser.update_time from sys_wx_user_info wxuser
         where (SELECT COUNT(wxlog.id) FROM sys_wx_user_log wxlog WHERE wxlog.openid = wxuser.openid) > 0
-        <where>
-            <if test="appid != null  and appid != ''">and wxuser.appid = #{appid}</if>
-            <if test="openid != null  and openid != ''">and wxuser.openid != #{openid}</if>
-        </where>
+        <if test="appid != null  and appid != ''">and wxuser.appid = #{appid}</if>
+        <if test="openid != null and openid != ''">and wxuser.openid  <![CDATA[ <> ]]> #{openid} </if>
         order by wxuser.update_time desc
     </select>
 
diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysWxUserLogMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysWxUserLogMapper.xml
index c726b5f43..86a1f4a4d 100644
--- a/stdiet-custom/src/main/resources/mapper/custom/SysWxUserLogMapper.xml
+++ b/stdiet-custom/src/main/resources/mapper/custom/SysWxUserLogMapper.xml
@@ -171,7 +171,7 @@
         </foreach>
     </delete>
 
-    <!-- 根据openid或手机号查询对应打卡记录 -->
+    <!-- 根据openid和手机号查询对应打卡记录 -->
     <select id="getWxLogInfoList" parameterType="SysWxUserLog" resultMap="WxLogInfo">
         SELECT wxlog.weight,wxlog.log_time,wxlog.sleep_time, wxlog.wakeup_time,wxlog.defecation, wxlog.water, wxlog.insomnia,wxlog.sport,wxlog.diet
         FROM sys_wx_user_log wxlog left join sys_wx_user_info wxinfo on wxinfo.openid  = wxlog.openid
@@ -183,4 +183,20 @@
         select id from sys_wx_user_log where to_days(log_time) = to_days(#{logTime}) and openid = #{openid} limit 1
     </select>
 
+    <!-- 根据手机号和openid查询打卡连续天数，只查询前两条 -->
+    <select id="getContinuity" parameterType="SysWxUserLog" resultType="Map">
+        SELECT yearMonth,MIN(log_time) AS minLogTime,MAX(log_time) AS maxLogTime,COUNT(*) AS continuityDayCount FROM
+          (
+            SELECT log_time,yearMonth,(days-date_rank) AS day_cha FROM
+            (
+                SELECT *,row_number() over(PARTITION BY yearMonth ORDER BY log_time) date_rank  FROM
+                (
+                    SELECT log_time,CONCAT(YEAR(log_time),'-',MONTH(log_time)) AS yearMonth,DAY(log_time) AS days
+                    FROM sys_wx_user_log wxlog left join sys_wx_user_info wxinfo on wxinfo.openid  = wxlog.openid
+                    where wxinfo.openid = #{openid} or wxinfo.phone = #{phone}
+                ) AS s ORDER BY s.log_time DESC
+            ) ss
+        ) sss GROUP BY yearMonth,day_cha LIMIT 2
+    </select>
+
 </mapper>
\ No newline at end of file