Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/service/impl/TaUvServiceImpl.java

@@ -44,6 +44,10 @@ public class TaUvServiceImpl extends ServiceImpl<TaUvMapper, TaUv> implements IT
             return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
 
+        if (typeOf.equals(CommConstant.FAVOR_PROJECT)) {
+            buildingMapper.setFieldNum(id,"pv_num",1);
+        }
+
         TaPerson taPerson = persons.get(0);
 
         QueryWrapper<TaUv> queryWrapper = new QueryWrapper<>();
@@ -83,9 +87,6 @@ public class TaUvServiceImpl extends ServiceImpl<TaUvMapper, TaUv> implements IT
         if (typeOf.equals(CommConstant.FAVOR_CONSULTANT)) {
             taPersonMapper.setFieldIncrement(id,"hot_num", 1);
         }
-        if (typeOf.equals(CommConstant.FAVOR_PROJECT)) {
-            buildingMapper.setFieldNum(id,"pv_num",1);
-        }
 
         return ResponseBean.success("");
     }

src/main/java/com/huiju/estateagents/statistic/controller/ActivityStatisticController.java

@@ -143,14 +143,14 @@ public class ActivityStatisticController extends BaseController {
                                                    @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
                                                    @RequestParam(value = "sharePersonType", required = false)String sharePersonType,
                                                    @RequestParam(value = "sharePersonName", required = false)  String sharePersonName,
-                                                   @RequestParam(value = "sharePhone", required = false)String sharePhone,
+                                                   @RequestParam(value = "sharePersonPhone", required = false)String sharePersonPhone,
                                                    @RequestParam(value = "activityId", required = false)String activityId,
                                                    @RequestParam(value = "activityType", required = false)String activityType,
                                                    @RequestParam(value = "sort", required = false)String sort,
                                                    @RequestParam(value = "colKey", required = false)String colKey,
                                                    @RequestParam(value = "buildingId", required = false)String buildingId,
                                                    HttpServletRequest request) {
-        return taActivityStaticService.selectActivitySharePersonNum(pageNum, pageSize, getOrgId(request), startDate, endDate, sharePersonType, sharePersonName, sharePhone, activityId, activityType, buildingId, sort, colKey, getTaPersonBuildingListByUserId(request), getUserId(request));
+        return taActivityStaticService.selectActivitySharePersonNum(pageNum, pageSize, getOrgId(request), startDate, endDate, sharePersonType, sharePersonName, sharePersonPhone, activityId, activityType, buildingId, sort, colKey, getTaPersonBuildingListByUserId(request), getUserId(request));
     }
 
     /**

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/TaBuildingMapper.xml

@@ -580,7 +580,7 @@
             FROM
             sequence a
             WHERE
-            a.rownum < datediff( #{endDate}, #{startDate} )
+            a.rownum <= datediff( #{endDate}, #{startDate} )
         ) t
         LEFT JOIN (
             SELECT
@@ -663,7 +663,7 @@
         FROM
         sequence a
         WHERE
-        a.rownum < datediff( #{endDate}, #{startDate} )
+        a.rownum <= datediff( #{endDate}, #{startDate} )
         ) t
         LEFT JOIN (
         SELECT
@@ -730,9 +730,11 @@
         GROUP BY
         DATE_FORMAT( create_date, '%Y-%m-%d' )
         ) u ON t.date = u.create_date
+        ORDER BY
         <if test="sortField != null and sortField != ''">
-            ORDER BY ${sortField} ${orderType}
+             ${sortField} ${orderType},
         </if>
+        create_date
     </select>
 
 </mapper>

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">
@@ -170,7 +182,7 @@
         sequence a
         <trim prefix="where">
             <if test="startDate != null or endDate != null">
-                a.rownum <![CDATA[ < ]]> datediff(#{endDate}, #{startDate})
+                a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
             </if>
         </trim>
         ) AS temp_date
@@ -248,7 +260,7 @@
         sequence a
         <trim prefix="where">
             <if test="startDate != null or endDate != null">
-                a.rownum <![CDATA[ < ]]> datediff(#{endDate}, #{startDate})
+                a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
             </if>
         </trim>
         ) AS temp_date
@@ -326,7 +338,7 @@
         sequence a
         <trim prefix="where">
             <if test="startDate != null or endDate != null">
-                a.rownum <![CDATA[ < ]]> datediff(#{endDate}, #{startDate})
+                a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
             </if>
         </trim>
         ) AS temp_date
@@ -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' )
@@ -376,7 +394,7 @@
         sequence a
         <trim prefix="where">
             <if test="startDate != null or endDate != null">
-                a.rownum <![CDATA[ < ]]> datediff(#{endDate}, #{startDate})
+                a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
             </if>
         </trim>
         ) AS temp_date
@@ -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')
@@ -425,7 +449,7 @@
         sequence a
         <trim prefix="where">
             <if test="startDate != null or endDate != null">
-                a.rownum <![CDATA[ < ]]> datediff(#{endDate}, #{startDate})
+                a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
             </if>
         </trim>
         ) AS temp_date
@@ -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' )
@@ -481,7 +511,7 @@
         sequence a
         <trim prefix="where">
             <if test="startDate != null or endDate != null">
-                a.rownum <![CDATA[ < ]]> datediff(#{endDate}, #{startDate})
+                a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
             </if>
         </trim>
         ) AS temp_date
@@ -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')
@@ -694,7 +736,7 @@
         sequence a
         <trim prefix="where">
             <if test="startDate != null or endDate != null">
-                a.rownum <![CDATA[ < ]]> datediff(#{endDate}, #{startDate})
+                a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
             </if>
         </trim>
         ) AS temp_date
@@ -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
@@ -1444,7 +1501,9 @@
             and t.target_type = concat(REPLACE(#{activityType}, 'activity', 'dynamic'), '_share')
         </if>
         and t.target_type in ('dynamic_share','h5_share','help_share','live_share', 'group_share')
-        and t.org_id = #{orgId} group by t.share_person ) t
+        and t.org_id = #{orgId}
+<!--        group by t.share_person -->
+        ) t
         left join ta_person a on t.share_person = a.person_id
         left join ta_person b on t.share_person = b.user_id
         ) as visitPersonNum on visitPersonNum.person_id = person.person_id
@@ -1512,7 +1571,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 +1604,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
@@ -1618,7 +1679,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="buildingId != null and buildingId != ''">
             and (