bug fix

src/main/java/com/huiju/estateagents/statistic/mapper/TaActicityStaticMapper.java

@@ -63,11 +63,26 @@ public interface TaActicityStaticMapper {
                                                      @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
                                                      @Param("userId") Integer userId);
 
-    List<Map<String, Object>> selectVisitCount(@Param("orgId") Integer orgId, @Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate, @Param("buildingId") String buildingId, @Param("targetType") String targetType);
+    List<Map<String, Object>> selectVisitCount(@Param("orgId") Integer orgId,
+                                               @Param("startDate") LocalDateTime startDate,
+                                               @Param("endDate") LocalDateTime endDate,
+                                               @Param("buildingId") String buildingId,
+                                               @Param("targetType") String targetType,
+                                               @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings);
 
-    List<Map<String, Object>> selectVisitPersonCount(@Param("orgId") Integer orgId, @Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate, @Param("buildingId") String buildingId, @Param("targetType") String targetType);
+    List<Map<String, Object>> selectVisitPersonCount(@Param("orgId") Integer orgId,
+                                                     @Param("startDate") LocalDateTime startDate,
+                                                     @Param("endDate") LocalDateTime endDate,
+                                                     @Param("buildingId") String buildingId,
+                                                     @Param("targetType") String targetType,
+                                                     @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings);
 
-    List<Map<String, Object>> selectAddRegistCount(@Param("orgId") Integer orgId, @Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate, @Param("buildingId") String buildingId, @Param("targetType") String targetType);
+    List<Map<String, Object>> selectAddRegistCount(@Param("orgId") Integer orgId,
+                                                   @Param("startDate") LocalDateTime startDate,
+                                                   @Param("endDate") LocalDateTime endDate,
+                                                   @Param("buildingId") String buildingId,
+                                                   @Param("targetType") String targetType,
+                                                   @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings);
 
     IPage<StatisicAttractUser> selectTableData(
             IPage<StatisicAttractUser> attractUserIPage,

src/main/java/com/huiju/estateagents/statistic/service/impl/TaActivityStaticServiceImpl.java

@@ -52,9 +52,9 @@ public class TaActivityStaticServiceImpl {
         // 新增用户数
         List<Map<String, Object>> selectShareCount = taActicityStaticMapper.selectShareCount(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType, taPersonBuildings, userId);
         List<Map<String, Object>> selectSharePersonCount = taActicityStaticMapper.selectSharePersonCount(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType, taPersonBuildings, userId);
-        List<Map<String, Object>> selectVisitCount = taActicityStaticMapper.selectVisitCount(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType);
-        List<Map<String, Object>> selectVisitPersonCount = taActicityStaticMapper.selectVisitPersonCount(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType);
-        List<Map<String, Object>> selectAddRegistCount = taActicityStaticMapper.selectAddRegistCount(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType);
+        List<Map<String, Object>> selectVisitCount = taActicityStaticMapper.selectVisitCount(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType, taPersonBuildings);
+        List<Map<String, Object>> selectVisitPersonCount = taActicityStaticMapper.selectVisitPersonCount(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType, taPersonBuildings);
+        List<Map<String, Object>> selectAddRegistCount = taActicityStaticMapper.selectAddRegistCount(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType, taPersonBuildings);
 
 
         for (Map<String, Object> ssc : selectShareCount){

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

@@ -131,6 +131,12 @@
         <if test="startDate == null or endDate == null">
             AND t.visit_time BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
+        <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
+            AND t.building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
+        </if>
         GROUP BY
         DATE_FORMAT(t.visit_time, '%Y-%m-%d'),
         person_id) as visitPersonCount
@@ -152,6 +158,12 @@
         <if test="endDate != null">
             and t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
+        <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
+            AND t.building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
+        </if>
     </select>
 
     <select id="selectShareCount" resultType="java.util.Map">
@@ -354,6 +366,12 @@
         <if test="startDate == null or endDate == null ">
             AND t.visit_time BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
+        <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
+            AND t.building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
+        </if>
         GROUP BY
         DATE_FORMAT( t.visit_time, '%Y-%m-%d' )
         ) AS temp ON temp_date.date = DATE_FORMAT( temp.create_date, '%Y-%m-%d' )
@@ -405,6 +423,12 @@
         <if test="startDate == null or endDate == null">
             AND t.visit_time BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
+        <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
+            AND t.building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
+        </if>
         GROUP BY
         DATE_FORMAT(t.visit_time, '%Y-%m-%d'),
         person_id) as visitPersonCount GROUP BY DATE_FORMAT(visitPersonCount.create_date, '%Y-%m-%d')
@@ -460,6 +484,12 @@
         <if test="startDate == null or endDate == null">
             AND t.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
+        <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
+            AND t.building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
+        </if>
         ) AS temp4
         GROUP BY
         DATE_FORMAT( temp4.create_date, '%Y-%m-%d' )
@@ -614,6 +644,12 @@
         <if test="startDate == null or endDate == null ">
             AND t.visit_time BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
+        <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
+            AND t.building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
+        </if>
         GROUP BY
         DATE_FORMAT( t.visit_time, '%Y-%m-%d' )
         ) AS temp2 ON temp_date.date = DATE_FORMAT( temp2.create_date, '%Y-%m-%d' )
@@ -642,6 +678,12 @@
         <if test="startDate == null or endDate == null">
             AND t.visit_time BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
+        <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
+            AND t.building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
+        </if>
         GROUP BY
         DATE_FORMAT(t.visit_time, '%Y-%m-%d'),
         person_id) as visitPersonCount GROUP BY DATE_FORMAT(visitPersonCount.create_date, '%Y-%m-%d')
@@ -826,6 +868,12 @@
         <if test="startDate == null or endDate == null ">
             AND t.visit_time BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
+        <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
+            AND t.building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
+        </if>
         GROUP BY
         DATE_FORMAT( t.visit_time, '%Y-%m-%d' )
         ) AS temp2 ON temp_date.date = DATE_FORMAT( temp2.create_date, '%Y-%m-%d' )
@@ -853,6 +901,12 @@
         <if test="startDate == null or endDate == null">
             AND t.visit_time BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
+        <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
+            AND t.building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
+        </if>
         GROUP BY
         DATE_FORMAT(t.visit_time, '%Y-%m-%d'),
         person_id) as visitPersonCount GROUP BY DATE_FORMAT(visitPersonCount.create_date, '%Y-%m-%d')
@@ -1027,7 +1081,8 @@
         <if test="startDate == null or endDate == null ">
             AND a.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
-        group by a.person_id, be_share, tagert_type
+        group by a.person_id
+<!--        , be_share, tagert_type-->
         ) as sharePersonNum group by sharePersonNum.be_share, sharePersonNum.tagert_type
         ) as sharePersonNum on sharePersonNum.be_share = activity.activityId and sharePersonNum.tagert_type =
         activity.activityType
@@ -1372,7 +1427,8 @@
             and t.be_share = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
-            and t.tagert_type = #{activityType}
+            and (case when #{activityType} = 'live' then t.tagert_type in ('liveApp', 'livePost') else t.tagert_type = #{activityType}
+            end)
         </if>
         <if test="sharePersonType != null and sharePersonType != ''">
             and f.person_type = #{sharePersonType}
@@ -1404,7 +1460,8 @@
                     and t.be_share = #{activityId}
                 </if>
                 <if test="activityType != null and activityType != ''">
-                    and t.tagert_type = #{activityType}
+                    and (case when #{activityType} = 'live' then t.tagert_type in ('liveApp', 'livePost') else t.tagert_type = #{activityType}
+                    end)
                 </if>
                 group by person_id
             ) as temp
@@ -1512,7 +1569,8 @@
             and t.be_share = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
-            and t.tagert_type = #{activityType}
+            and (case when #{activityType} = 'live' then t.tagert_type in ('liveApp', 'livePost') else t.tagert_type = #{activityType}
+            end)
         </if>
         <if test="sharePersonType != null and sharePersonType != ''">
             and f.person_type = #{sharePersonType}
@@ -1544,7 +1602,8 @@
             and t.be_share = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
-            and t.tagert_type = #{activityType}
+            and (case when #{activityType} = 'live' then t.tagert_type in ('liveApp', 'livePost') else t.tagert_type = #{activityType}
+            end)
         </if>
         group by person_id
         ) as temp