Merge remote-tracking branch 'origin/dev' into dev

src/main/resources/mapper/TsActivityDailyMapper.xml

 
     <select id="getActivityDetail" resultType="com.huiju.estateagents.entity.TsActivityDaily">
         SELECT
-            t.statis_date,
-            SUM(t.share_num) as share_num,
-            SUM(t.share_persons) as share_persons,
-            SUM(t.visit_num) as visit_num,
-            SUM(t.visit_persons) as visit_persons,
-            SUM(t.new_persons) as new_persons,
-            SUM(t.new_customers) as new_customers
+            a.statis_date,
+            IFNULL(b.share_num, 0) as share_num,
+            IFNULL(b.share_persons, 0) as share_persons,
+            IFNULL(b.visit_num, 0) as visit_num,
+            IFNULL(b.visit_persons, 0) as visit_persons,
+            IFNULL(b.new_persons, 0) as new_persons,
+            IFNULL(b.new_customers, 0) as new_customers
         FROM
-            ts_activity_daily t
-        WHERE
-            t.org_id = #{orgId}
-            AND t.statis_date BETWEEN #{startDate} AND #{endDate}
+        (
+            SELECT
+                DATE_FORMAT(
+                    DATE_ADD( STR_TO_DATE( '2020-04-18', '%Y-%m-%d' ), INTERVAL rownum DAY ), '%Y-%m-%d' ) AS statis_date
+            FROM sequence
+            WHERE rownum &lt; DATEDIFF(STR_TO_DATE( #{endDate}, '%Y-%m-%d' ), STR_TO_DATE( #{startDate}, '%Y-%m-%d' ))
+        ) a
+        LEFT JOIN (
+            SELECT
+                t.statis_date,
+                SUM(t.share_num) as share_num,
+                SUM(t.share_persons) as share_persons,
+                SUM(t.visit_num) as visit_num,
+                SUM(t.visit_persons) as visit_persons,
+                SUM(t.new_persons) as new_persons,
+                SUM(t.new_customers) as new_customers
+            FROM
+                ts_activity_daily t
+            WHERE
+                t.org_id = #{orgId}
+                AND t.statis_date BETWEEN #{startDate} AND #{endDate}
 
-        <if test="buildingId != null and buildingId != ''">
-            AND t.building_id = #{buildingId}
-        </if>
+            <if test="buildingId != null and buildingId != ''">
+                AND t.building_id = #{buildingId}
+            </if>
 
-        <if test="targetType != null and targetType != ''">
-            AND t.target_type = #{targetType}
-        </if>
+            <if test="targetType != null and targetType != ''">
+                AND t.target_type = #{targetType}
+            </if>
 
-        <if test="targetId != null and targetId != ''">
-            AND t.target_id = #{targetId}
-        </if>
+            <if test="targetId != null and targetId != ''">
+                AND t.target_id = #{targetId}
+            </if>
 
-        <if test="targetName != null and targetName != ''">
-            AND t.target_name like CONCAT('%', #{targetName}, '%')
-        </if>
+            <if test="targetName != null and targetName != ''">
+                AND t.target_name like CONCAT('%', #{targetName}, '%')
+            </if>
+
+            GROUP BY t.statis_date
+        ) b ON a.statis_date = b.statis_date
 
-        GROUP BY t.statis_date
+        <if test="asc != null and asc == 'statis_date'">
+            ORDER BY a.statis_date ASC
+        </if>
+        <if test="desc != null and desc == 'statis_date'">
+            ORDER BY a.statis_date DESC
+        </if>
 
-        <if test="asc != null and asc != ''">
-            ORDER BY ${asc} ASC
+        <if test="asc != null and asc != '' and asc != 'statis_date'">
+            ORDER BY b.${asc} ASC
         </if>
-        <if test="desc != null and desc != ''">
-            ORDER BY ${desc} DESC
+        <if test="desc != null and desc != '' and desc != 'statis_date'">
+            ORDER BY b.${desc} DESC
         </if>
     </select>
 

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

             and a.building_id = #{buildingId}
         </if>
         <if test="activityName != null and activityName != '' ">
-            and a.title = #{activityName}
+            and a.title like concat('%', #{activityName}, '%')
         </if>
         <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
             and a.building_id in
             and b.building_id = #{buildingId}
         </if>
         <if test="activityName != null and activityName != '' ">
-            and b.title = #{activityName}
+            and b.title like concat('%', #{activityName}, '%')
         </if>
         <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
             and b.building_id in
             and c.building_id = #{buildingId}
         </if>
         <if test="activityName != null and activityName != '' ">
-            and c.activity_name = #{activityName}
+            and c.activity_name like concat('%', #{activityName}, '%')
         </if>
         <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
             and c.building_id in
             and d.building_id = #{buildingId}
         </if>
         <if test="activityName != null and activityName != '' ">
-            and d.name = #{activityName}
+            and d.name like concat('%', #{activityName}, '%')
         </if>
         <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
-            and c.building_id in
+            and d.building_id in
             <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
                 #{taPersonBuilding.buildingId}
             </foreach>
             and e.building_id = #{buildingId}
         </if>
         <if test="activityName != null and activityName != '' ">
-            and e.live_activity_title = #{activityName}
+            and e.live_activity_title like concat('%', #{activityName}, '%')
         </if>
         <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
             and e.building_id in
             <if test="startDate == null or endDate == null ">
                 AND a.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
             </if>
-            group by a.be_share
+            group by a.be_share,a.tagert_type
         ) as shareNum on shareNum.be_share = activity.activityId and shareNum.tagert_type = activity.activityType
 
         left join (
         activity.activityType
 
         left join (
-            select count(*) as visitNum, a.target_id, case when a.target_type = 'dynamic' then 'activity' else a.target_type end as target_type
+            select count(*) as visitNum, a.target_id, case when a.target_type = 'dynamic' then 'activity' when a.target_type is null then 'h5' else a.target_type end as target_type
             From ta_person_visit_record a where a.event_type in
             ('activity','group','h5','help') and a.`event` = 'detail' and a.org_id = #{orgId}
-            <if test="targetType != null and targetType != ''">
+            <if test="targetType != null and targetType != '' and targetType != 'h5'">
                 and (case when #{targetType} = 'activity' then a.target_type = 'dynamic' else a.target_type = #{targetType}
                 end)
             </if>
             <if test="startDate == null or endDate == null ">
                 AND a.visit_time BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
             </if>
-            group by a.target_id, a.event_type
+            group by a.target_id, a.target_type
         ) as visitNum on visitNum.target_id = activity.activityId and visitNum.target_type = activity.activityType
 
         left join (
-            SELECT count(DISTINCT(a.person_id)) as visitPersonNum , a.target_id, case when a.target_type = 'dynamic' then 'activity' else a.target_type end as event_type
+            SELECT count(DISTINCT(a.person_id)) as visitPersonNum , a.target_id, case when a.target_type = 'dynamic' then 'activity' when a.target_type is null then 'h5' else a.target_type end as event_type
             From ta_person_visit_record a where a.event_type in ('activity','group','h5','help') and a.`event` =
             'detail' and a.org_id = #{orgId}
-            <if test="targetType != null and targetType != ''">
+            <if test="targetType != null and targetType != '' and targetType != 'h5'">
                 and (case when #{targetType} = 'activity' then a.target_type = 'dynamic' else a.target_type = #{targetType}
                 end)
             </if>
             <if test="startDate == null or endDate == null ">
                 AND a.visit_time BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
             </if>
-            group by a.target_id, a.event_type
+            group by a.target_id, a.target_type
         ) as visitPersonNum on visitPersonNum.target_id = activity.activityId and visitPersonNum.event_type =
         activity.activityType
 
         'help_share', 'live_share', 'group_share' ) and a.org_id = #{orgId}
         and a.status = 1
         and a.is_first_time = 1
-        <if test="targetType != null and targetType != ''">
+        <if test="targetType != null and targetType != '' and targetType != 'h5'">
             and a.target_type = #{targetType}
         </if>
         <if test="startDate != null ">
     <select id="selectActivityStatisDetailExport"
             resultType="com.huiju.estateagents.excel.ActivityStatistics.ActivityDetailShareRecord">
         select
-        activity.activityId, activity.activityName,
-        case when activity.activityType = 'activity' then '报名活动'
-        when activity.activityType = 'help' then '助力活动'
-        when activity.activityType = 'group' then '拼团活动'
-        when activity.activityType = 'h5' then 'H5活动'
-        when activity.activityType = 'live' then '直播活动'
-        end as activityType,
+        activity.*,
         ifnull(shareNum.shareNum, 0) as shareNum,
         ifnull(sharePersonNum.sharePersonNum, 0) as sharePersonNum,
         ifnull(visitNum.visitNum, 0) as visitNum,
         FROM ta_share_count a where a.tagert_type in (
         'activity', 'group','h5','help','liveApp','livePost')
         and a.org_id = #{orgId}
+        <if test="targetType != null and targetType != ''">
+            and a.tagert_type = #{targetType}
+        </if>
         <if test="startDate != null ">
-            and a.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d' )
+            and a.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="endDate != null ">
-            and a.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
+            and a.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="startDate == null or endDate == null ">
             AND a.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
-        group by a.be_share
+        group by a.be_share,a.tagert_type
         ) as shareNum on shareNum.be_share = activity.activityId and shareNum.tagert_type = activity.activityType
 
         left join (
-        select count(*) as sharePersonNum ,sharePersonNum.be_share, sharePersonNum.tagert_type,
-        sharePersonNum.create_date from (
-        SELECT a.be_share, a.create_date ,case when a.tagert_type = 'liveApp' then 'live' when a.tagert_type = 'livePost' then 'live' else a.tagert_type end   as tagert_type From ta_share_count a where a.tagert_type in ( 'activity', 'group','h5','help','liveApp','livePost')
+        SELECT count(*) as sharePersonNum ,sharePersonNum.be_share, sharePersonNum.tagert_type, sharePersonNum.create_date from (
+        SELECT a.be_share, a.create_date ,case when a.tagert_type = 'liveApp' then 'live' when a.tagert_type = 'livePost' then 'live' else a.tagert_type end   as tagert_type
+        From ta_share_count a where a.tagert_type in ( 'activity', 'group','h5','help','liveApp','livePost')
         and a.org_id = #{orgId}
+        <if test="targetType != null and targetType != ''">
+            and a.tagert_type = #{targetType}
+        </if>
         <if test="startDate != null ">
-            and a.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d' )
+            and a.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="endDate != null ">
-            and a.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
+            and a.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="startDate == null or endDate == null ">
             AND a.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         activity.activityType
 
         left join (
-        select * from (
-        select count(*) as visitNum, a.target_id, a.event_type From ta_person_visit_record a where a.event_type in
+        select count(*) as visitNum, a.target_id, case when a.target_type = 'dynamic' then 'activity' when a.target_type is null then 'h5' else a.target_type end as target_type
+        From ta_person_visit_record a where a.event_type in
         ('activity','group','h5','help') and a.`event` = 'detail' and a.org_id = #{orgId}
+        <if test="targetType != null and targetType != '' and targetType != 'h5'">
+            and (case when #{targetType} = 'activity' then a.target_type = 'dynamic' else a.target_type = #{targetType}
+            end)
+        </if>
         <if test="startDate != null">
-            and a.visit_time &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d' )
+            and a.visit_time &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="endDate != null">
-            and a.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
+            and a.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="startDate == null or endDate == null ">
             AND a.visit_time BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
-        group by a.target_id, a.event_type
-        ) as a
-        ) as visitNum on visitNum.target_id = activity.activityId and visitNum.event_type = activity.activityType
+        group by a.target_id, a.target_type
+        ) as visitNum on visitNum.target_id = activity.activityId and visitNum.target_type = activity.activityType
 
         left join (
-        select count(*) as visitPersonNum ,visitPersonNum.target_id, visitPersonNum.event_type from (
-        select a.* From ta_person_visit_record a where a.event_type in ('activity','group','h5','help') and a.`event` =
+        SELECT count(DISTINCT(a.person_id)) as visitPersonNum , a.target_id, case when a.target_type = 'dynamic' then 'activity' when a.target_type is null then 'h5' else a.target_type end as event_type
+        From ta_person_visit_record a where a.event_type in ('activity','group','h5','help') and a.`event` =
         'detail' and a.org_id = #{orgId}
+        <if test="targetType != null and targetType != '' and targetType != 'h5'">
+            and (case when #{targetType} = 'activity' then a.target_type = 'dynamic' else a.target_type = #{targetType}
+            end)
+        </if>
         <if test="startDate != null">
-            and a.visit_time &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d' )
+            and a.visit_time &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="endDate != null">
-            and a.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
+            and a.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="startDate == null or endDate == null ">
             AND a.visit_time BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
-        group by a.person_id, a.target_id, a.event_type
-        ) as visitPersonNum group by visitPersonNum.target_id, visitPersonNum.event_type
+        group by a.target_id, a.target_type
         ) as visitPersonNum on visitPersonNum.target_id = activity.activityId and visitPersonNum.event_type =
         activity.activityType
 
         'help_share', 'live_share', 'group_share' ) and a.org_id = #{orgId}
         and a.status = 1
         and a.is_first_time = 1
+        <if test="targetType != null and targetType != '' and targetType != 'h5'">
+            and a.target_type = #{targetType}
+        </if>
         <if test="startDate != null ">
-            and a.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d' )
+            and a.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="endDate != null ">
-            and a.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
+            and a.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="startDate == null or endDate == null">
             AND a.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
             order by sharePersonNum.create_date desc
         </if>
         <if test="colKey != null and colKey != ''">
-            ORDER BY ${colKey} ${sort}
+            ORDER BY ${colKey} ${sortType}
         </if>
     </select>
 
             and t.target_id = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
-            and (case when #{activityType} = 'activity' then t.target_type = 'dynamic' else t.target_type = #{activityType}
+            and (case when #{activityType} = 'activity' then t.target_type = 'dynamic' when #{activityType} = 'h5' then t.event_type = 'h5' else t.target_type = #{activityType}
             end)
         </if>
         <if test="buildingId != null and buildingId != ''">
             and t.target_id = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
-            and (case when #{activityType} = 'activity' then t.target_type = 'dynamic' else t.target_type = #{activityType}
+            and (case when #{activityType} = 'activity' then t.target_type = 'dynamic' when #{activityType} = 'h5' then t.event_type = 'h5' else t.target_type = #{activityType}
             end)
         </if>
         <if test="buildingId != null and buildingId != ''">
             and t.target_id = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
-            and (case when #{activityType} = 'activity' then t.target_type = 'dynamic' else t.target_type = #{activityType}
+            and (case when #{activityType} = 'activity' then t.target_type = 'dynamic' when #{activityType} = 'h5' then t.event_type = 'h5' else t.target_type = #{activityType}
             end)
         </if>
         <if test="buildingId != null and buildingId != ''">
             and t.target_id = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
-            and (case when #{activityType} = 'activity' then t.target_type = 'dynamic' else t.target_type = #{activityType}
+            and (case when #{activityType} = 'activity' then t.target_type = 'dynamic' when #{activityType} = 'h5' then t.event_type = 'h5' else t.target_type = #{activityType}
             end)
         </if>
         <if test="buildingId != null and buildingId != ''">
         if(a.gender = '1', '男', if(a.gender = '2', '女','未知') ) as gender,
         a.province,
         b1.scene_alias as personFrom,
-        d.user_name as realtyConsultant,
-        d.phone as realtyConsultantPhone,
+        GROUP_CONCAT(d.user_name) as realtyConsultant,
+        GROUP_CONCAT(d.phone) as realtyConsultantPhone,
         t.create_date as visitDate,
         ifnull(e.nickname, f.user_name) as sharePersonName,
         ifnull(e.phone, f.phone) as sharePersonPhone
         if(a.gender = '1', '男', if(a.gender = '2', '女','未知') ) as gender,
         a.province,
         b1.scene_alias as personFrom,
-        d.user_name as realtyConsultant,
-        d.phone as realtyConsultantPhone,
+        GROUP_CONCAT(d.user_name) as realtyConsultant,
+        GROUP_CONCAT(d.phone) as realtyConsultantPhone,
         t.create_date as visitDate,
         ifnull(e.nickname, f.user_name) as sharePersonName,
         ifnull(e.phone, f.phone) as sharePersonPhone