统计

src/main/resources/mapper/TaPersonMapper.xml

@@ -235,17 +235,17 @@ FROM
                   DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum WEEK ), '%Y-%m-%d' ) AS date
               </if>
               <if test="dateType == 'month'.toString()">
-                  DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum MONTH ), '%Y-%m-%d' ) AS date
+                  DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum MONTH ), '%Y-%m' ) AS date
               </if>
             FROM
               sequence a
 
               <trim prefix="where">
                   <if test="startDate != null or endDate != null">
-                      a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
+                      a.rownum <![CDATA[ < ]]> datediff(#{endDate}, #{startDate})
                   </if>
                   <if test="startDate == null or endDate == null">
-                      a.rownum <![CDATA[ <= ]]> 7
+                      a.rownum <![CDATA[ < ]]> 7
                   </if>
               </trim>
 
@@ -260,7 +260,14 @@ FROM
             ( SELECT * FROM ta_person_visit_record GROUP BY  person_id  ) as tpvr
             ON tp.person_id = tpvr.person_id
              where ifnull(tp.person_type, '') != #{personType}
-        ) AS temp ON temp_date.date = DATE_FORMAT( temp.visit_time , '%Y-%m-%d' )
+        ) AS temp ON
+        <if test="dateType == 'month'.toString()">
+            temp_date.date = DATE_FORMAT( temp.visit_time , '%Y-%m' ) ORDER BY temp_date.date
+        </if>
+        <if test="dateType != 'month'.toString()">
+            temp_date.date = DATE_FORMAT( temp.visit_time , '%Y-%m-%d' ) ORDER BY temp_date.date
+        </if>
+
     </select>
 
     <select id="selectNewsUserCount" resultType="map">