新增用户数 SQL修改

src/main/resources/mapper/TaPersonMapper.xml

@@ -246,64 +246,72 @@ FROM
         SELECT
         authorization_count_table.date as date,
         ifnull(authorization_count_table.authorization_count, 0) as authorization_count,
-        user_count_table.user_count as user_count
+        ifnull(user_count_table.user_count, 0) as user_count
         FROM
         (
             SELECT
-              *
+            *
             FROM
             (
-                SELECT
-                DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date
-                FROM
-                sequence a
-                WHERE
+            SELECT
+              DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date
+            FROM
+              sequence a
+            WHERE
+
                 <if test="startDate == null or endDate == null">
                     a.rownum <![CDATA[ <= ]]> 7
                 </if>
                 <if test="startDate != null or endDate != null">
                     a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
                 </if>
+
             ) AS temp_date
             LEFT JOIN (
                 SELECT
-                COUNT(1) as authorization_count,
-                tpvr.visit_time AS visit_time
+                  COUNT(1) as authorization_count,
+                tp.create_date AS create_date
                 FROM
-                ta_person tp
-                INNER JOIN ta_person_visit_record tpvr ON tp.person_id = tpvr.person_id
+                  ta_person tp
                 where ifnull(tp.person_type, '') != #{personType}
-                and tp.phone is NOT NULL
-            ) AS temp ON temp_date.date = DATE_FORMAT( temp.visit_time , '%Y-%m-%d' )
+                  and tp.phone is NOT NULL
+                GROUP BY tp.create_date
+                ) AS temp ON temp_date.date = DATE_FORMAT( temp.create_date , '%Y-%m-%d' )
+
         ) as authorization_count_table
         ,
-        (SELECT
-        *
-        FROM
         (
+          SELECT
+            *
+            FROM
+            (
             SELECT
-            DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date
+             DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date
             FROM
-            sequence a
+              sequence a
             WHERE
-            <if test="startDate == null or endDate == null">
-                a.rownum <![CDATA[ <= ]]> 7
-            </if>
-            <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>
+                <if test="startDate != null or endDate != null">
+                    a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
+                </if>
+
         ) AS temp_date
         LEFT JOIN (
             SELECT
-            COUNT(1) as user_count,
-            tpvr.visit_time AS visit_time
+              COUNT(1) as user_count,
+            tp.create_date AS create_date
             FROM
-            ta_person tp
-            INNER JOIN ta_person_visit_record tpvr ON tp.person_id = tpvr.person_id
+                ta_person tp
             where ifnull(tp.person_type, '') != #{personType}
-        ) AS temp ON temp_date.date = DATE_FORMAT( temp.visit_time , '%Y-%m-%d' )
+            GROUP BY tp.create_date
+            ) AS temp ON temp_date.date = DATE_FORMAT( temp.create_date , '%Y-%m-%d' )
 
         ) as user_count_table
+        where
+          user_count_table.date = authorization_count_table.date
         GROUP BY date
     </select>