提交

src/main/resources/mapper/TaPersonMapper.xml

@@ -418,7 +418,7 @@ FROM
         FROM
         (
             SELECT
-            DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date,
+            DATE_FORMAT( DATE_SUB( <if test="endDate != null">#{endDate}</if><if test="endDate == null">now()</if>, INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date,
             tempf.from_name as from_name,
             tempf.from_code as from_code
             FROM
@@ -438,7 +438,7 @@ FROM
         (
             SELECT
                 ifnull(COUNT(1), 0) as count,
-                tps.create_date as create_date,
+                DATE_FORMAT( tps.create_date, '%Y-%m-%d' ) as create_date,
                 tpfs.from_code as from_code,
                 tpfs.from_name as from_name
             FROM ta_person tps
@@ -449,14 +449,14 @@ FROM
             and tps.person_type IN ('customer','drift','estate agent')
             AND tps.create_date BETWEEN #{startDate} AND #{endDate}
 
-            GROUP BY tpfs.from_code
+            GROUP BY tpfs.from_code, DATE_FORMAT( tps.create_date, '%Y-%m-%d' )
         ) as user_count
         ON DATE_FORMAT(user_count.create_date,'%Y-%m-%d') =  temp_date.date and temp_date.from_code = user_count.from_code
         LEFT JOIN
         (
             SELECT
                 ifnull(COUNT(1), 0) as count,
-                tps.create_date as create_date,
+                DATE_FORMAT( tps.create_date, '%Y-%m-%d' ) as create_date,
                 tpfs.from_code as from_code,
                 tpfs.from_name as from_name
             FROM ta_person tps
@@ -467,7 +467,7 @@ FROM
                 and tps.person_type IN ('customer','drift','estate agent')
                 AND tps.create_date BETWEEN #{startDate} AND #{endDate}
                 and tps.phone is not null
-            GROUP BY tpfs.from_code
+            GROUP BY tpfs.from_code,DATE_FORMAT( tps.create_date, '%Y-%m-%d' )
         ) as registered_count
         ON DATE_FORMAT(user_count.create_date,'%Y-%m-%d') =  temp_date.date and temp_date.from_code = registered_count.from_code
         order by temp_date.date DESC