新需求

src/main/resources/mapper/statistic/TaActivityStaticMapper.xml

@@ -152,48 +152,47 @@
         *
         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>
-        </trim>
+            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>
+            </trim>
         ) AS temp_date
         LEFT JOIN (
-        SELECT
-        COUNT( 1 ) AS user_count,
-        t.create_date AS create_date
-        FROM
-        ta_share_count t
-        left join ta_help_activity a on t.be_share = a.help_activity_id
-        left join ta_share_activity b on t.be_share = b.share_id
-        left join ta_live_activity c on t.be_share = c.live_activity_id
-        left join ta_drainage d on t.be_share = d.drainage_id
-        left join ta_building_dynamic e on t.be_share = e.dynamic_id
-        left join ta_person f on t.person_id = f.person_id
-        WHERE
-        t.tagert_type in ('activity','group','h5','help','liveApp','livePost') and f.org_id = #{orgId}
-        <if test="buildingId != null and buildingId != ''">
-            and (a.building_id = #{buildingId} or b.building_id = #{buildingId} or c.building_id = #{buildingId} or d.building_id = #{buildingId} or e.building_id = #{buildingId})
-        </if>
-        <if test="targetType != null and targetType != ''">
-            and t.tagert_type = #{targetType}
-        </if>
-        <if test="startDate != null ">
-            and t.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d' )
-        </if>
-        <if test="endDate != null ">
-            and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
-        </if>
-        <if test="startDate == null or endDate == null ">
-            AND t.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
-        </if>
-        GROUP BY
-        DATE_FORMAT( t.create_date, '%Y-%m-%d' ), t.person_id
-        ) AS temp ON temp_date.date = DATE_FORMAT( temp.create_date, '%Y-%m-%d' )
+                select temp1.user_count, temp1.create_date from (
+                SELECT COUNT( 1 ) AS user_count, t.create_date AS create_date, t.person_id
+                FROM
+                ta_share_count t
+                left join ta_help_activity a on t.be_share = a.help_activity_id
+                left join ta_share_activity b on t.be_share = b.share_id
+                left join ta_live_activity c on t.be_share = c.live_activity_id
+                left join ta_drainage d on t.be_share = d.drainage_id
+                left join ta_building_dynamic e on t.be_share = e.dynamic_id
+                left join ta_person f on t.person_id = f.person_id
+                WHERE
+                t.tagert_type in ('activity','group','h5','help','liveApp','livePost') and t.org_id = #{orgId}
+                <if test="buildingId != null and buildingId != ''">
+                    and (a.building_id = #{buildingId} or b.building_id = #{buildingId} or c.building_id = #{buildingId} or d.building_id = #{buildingId} or e.building_id = #{buildingId})
+                </if>
+                <if test="targetType != null and targetType != ''">
+                    and t.tagert_type = #{targetType}
+                </if>
+                <if test="startDate != null ">
+                    and t.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d' )
+                </if>
+                <if test="endDate != null ">
+                    and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
+                </if>
+                <if test="startDate == null or endDate == null ">
+                    AND t.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
+                </if>
+                GROUP BY t.person_id
+                ) as temp1
+            ) AS temp ON temp_date.date = DATE_FORMAT( temp.create_date, '%Y-%m-%d' )
         ) AS share_person_count_table
 
         group by date order by date