company-app 会员统计SQL调整

fs-service/src/main/resources/mapper/his/FsUserMapper.xml

@@ -281,10 +281,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="tabValue != null and tabValue !='' ">
             <choose>
                 <when test = "tabValue == 1">
-                    AND DAY(fs_user_company_user.create_time) = DAY(NOW())
+                    AND fs_user_company_user.create_time >= CURDATE() AND fs_user_company_user.create_time &lt; CURDATE() + INTERVAL 1 DAY
                 </when>
                 <when test = "tabValue == 2">
-                    AND DAY(fs_user_course_count.complete_watch_date) = DAY(NOW())
+                    AND fs_user_course_count.complete_watch_date >= CURDATE() AND fs_user_course_count.complete_watch_date &lt; CURDATE() + INTERVAL 1 DAY
                 </when>
                 <when test = "tabValue == 3">
                     AND (fs_user_course_count.status = 3 or fs_user_course_count.status is null)
@@ -315,19 +315,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </choose>
         </if>
 
-        group by fs_user.user_id, fs_user_company_user.project_id
+        group by fs_user.user_id, fs_user_company_user.project_id, fs_user_company_user.create_time
 
-        <if test="continueMissCourseSort != null and continueMissCourseSort !='' ">
-            order by
-            <choose>
-                <when test = "continueMissCourseSort == 0">
-                    fs_user.create_time desc
-                </when>
-                <when test = "continueMissCourseSort == 1">
-                    fs_user.nick_name asc
-                </when>
-            </choose>
-        </if>
+        order by
+        <choose>
+            <when test = "continueMissCourseSort != null and continueMissCourseSort == 0">
+                fs_user_company_user.create_time desc,fs_user.user_id desc
+            </when>
+            <when test = "continueMissCourseSort != null and continueMissCourseSort == 1">
+                fs_user.nick_name asc,fs_user.user_id desc
+            </when>
+            <otherwise>
+                fs_user.user_id desc, fs_user_company_user.project_id
+            </otherwise>
+        </choose>
     </select>
 
     <select id="selectFsUserPageListNew" resultType="com.fs.store.vo.h5.FsUserPageListVO">