统计

src/main/java/com/huiju/estateagents/mapper/TaPersonMapper.java

@@ -127,8 +127,8 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      */
     @ResultType(Map.class)
     @Select("SELECT " +
-            "b.NAME AS city," +
-            "count(a.person_id) AS city_count" +
+            "ifnull(b.NAME, '其他') AS city, " +
+            "count(a.person_id) AS city_count " +
             " FROM" +
             " ta_person a" +
             " LEFT JOIN ( select t.*, s.pinyin as province from td_city t JOIN td_city s on t.parentid = s.id) b ON a.city = b.pinyin and a.province = b.province where ifnull(a.person_type, '') != #{personType} and a.city is not null GROUP BY a.city")

src/main/resources/mapper/TaPersonMapper.xml

@@ -146,32 +146,17 @@ FROM
 
     <select id="selectRecentlyCount" resultType="integer" >
         SELECT
-          ifnull(SUM(activity_count), 0) as activity_count
+            COUNT(1) as activity_count
         FROM
-        (
-            SELECT
-              DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date
-            FROM
-              sequence a
-
-              <trim prefix="where">
-                  <if test="startDate != null or endDate != null">
-                      a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
-                  </if>
-                  <if test="startDate == null or endDate == null">
-                      a.rownum <![CDATA[ <= ]]>  7
-                  </if>
-              </trim>
+        ta_person tp
+        where ifnull(tp.person_type, '') != #{personType}
 
-        ) AS temp_date
-        LEFT JOIN (
-            SELECT
-            COUNT(1) as activity_count,
-            tp.create_date AS create_date
-            FROM
-            ta_person tp
-            where ifnull(tp.person_type, '') != #{personType}
-        ) AS temp ON temp_date.date = DATE_FORMAT( temp.create_date , '%Y-%m-%d' )
+        <if test="startDate != null or endDate != null">
+            AND  tp.create_date BETWEEN #{startDate} and #{endDate}
+        </if>
+        <if test="startDate == null or endDate == null">
+            AND tp.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
+        </if>
     </select>
 
 
@@ -295,14 +280,22 @@ FROM
 
             ) AS temp_date
             LEFT JOIN (
-                SELECT
-                  COUNT(1) as authorization_count,
-                tp.create_date AS create_date
-                FROM
-                  ta_person tp
-                where ifnull(tp.person_type, '') != #{personType}
-                  and tp.phone is NOT NULL
-                GROUP BY tp.create_date
+
+                    SELECT
+                        COUNT(1) as authorization_count,
+                        tp.create_date as create_date
+                    FROM
+                      ta_person tp
+                    where ifnull(tp.person_type, '') != #{personType}
+                    and tp.phone is NOT NULL
+                    <if test="startDate != null or endDate != null">
+                        AND tp.create_date BETWEEN #{startDate} and #{endDate}
+                    </if>
+                    <if test="startDate == null or endDate == null">
+                         AND tp.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
+                    </if>
+                    GROUP BY DATE_FORMAT( tp.create_date , '%Y-%m-%d' )
+
                 ) AS temp ON temp_date.date = DATE_FORMAT( temp.create_date , '%Y-%m-%d' )
 
         ) as authorization_count_table
@@ -325,13 +318,21 @@ FROM
 
         ) AS temp_date
         LEFT JOIN (
-            SELECT
-              COUNT(1) as user_count,
-            tp.create_date AS create_date
-            FROM
-                ta_person tp
-            where ifnull(tp.person_type, '') != #{personType}
-            GROUP BY tp.create_date
+
+                SELECT
+                    COUNT(1) as user_count,
+                    tp.create_date as create_date
+                FROM
+                 ta_person tp
+                where ifnull(tp.person_type, '') != #{personType}
+                <if test="startDate != null or endDate != null">
+                    AND tp.create_date BETWEEN #{startDate} and #{endDate}
+                </if>
+                <if test="startDate == null or endDate == null">
+                    AND tp.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
+                </if>
+                GROUP BY DATE_FORMAT( tp.create_date , '%Y-%m-%d' )
+
             ) AS temp ON temp_date.date = DATE_FORMAT( temp.create_date , '%Y-%m-%d' )
 
         ) as user_count_table