新需求

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

                                                    @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, sort, colKey);
+        return taActivityStaticService.selectActivitySharePersonNum(pageNum, pageSize, getOrgId(request), startDate, endDate, sharePersonType, sharePersonName, sharePhone, activityId, activityType, buildingId, sort, colKey);
     }
 
     /**
                                                      @RequestParam(value = "activityId", required = false)String activityId,
                                                      @RequestParam(value = "activityType", required = false)String activityType,
                                                      @RequestParam(value = "personId", required = false)String personId,
+                                                     @RequestParam(value = "buildingId", required = false)String buildingId,
                                                      @RequestParam(value = "sort", required = false)String sort,
                                                      @RequestParam(value = "colKey", required = false)String colKey,
                                                      HttpServletRequest request) {
-        return taActivityStaticService.selectActivityShareNum(pageNum, pageSize, getOrgId(request), startDate, endDate, sharePersonType, sharePersonName, sharePhone, activityId, activityType, personId, sort, colKey);
+        return taActivityStaticService.selectActivityShareNum(pageNum, pageSize, getOrgId(request), startDate, endDate, sharePersonType, sharePersonName, sharePhone, activityId, activityType, personId, buildingId, sort, colKey);
     }
 
     /**

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

             @Param("sharePhone") String sharePhone,
             @Param("activityId") String activityId,
             @Param("activityType") String activityType,
+            @Param("buildingId") String buildingId,
             @Param("sort") String sort,
             @Param("colKey") String colKey
     );
             @Param("activityId") String activityId,
             @Param("activityType") String activityType,
             @Param("personId") String personId,
+            @Param("buildingId") String buildingId,
             @Param("sort") String sort,
             @Param("colKey") String colKey
     );

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

     @Autowired
     private TaActicityStaticMapper taActicityStaticMapper;
 
-    public ResponseBean activityStatistical(LocalDate startDate, LocalDate endDate, String buidling, String targetType, Integer orgId){
+    public ResponseBean activityStatistical(LocalDate startDate, LocalDate endDate, String building, String targetType, Integer orgId){
 
         ResponseBean responseBean = new ResponseBean();
         Map<String, Object> map = new HashMap<>();
 
-        Integer sharePersonNum = taActicityStaticMapper.selectSharePersonNum(LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), buidling, targetType, orgId);
+        Integer sharePersonNum = taActicityStaticMapper.selectSharePersonNum(LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), building, targetType, orgId);
 
-        Integer shareNum = taActicityStaticMapper.selectShareNum(LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), buidling, targetType, orgId);
+        Integer shareNum = taActicityStaticMapper.selectShareNum(LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), building, targetType, orgId);
 
-        Integer visitPersonNum = taActicityStaticMapper.selectVisitPersonNum(LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), buidling, targetType, orgId);
+        Integer visitPersonNum = taActicityStaticMapper.selectVisitPersonNum(LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), building, targetType, orgId);
 
-        Integer visitNum = taActicityStaticMapper.selectVisitNum(LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), buidling, targetType, orgId);
+        Integer visitNum = taActicityStaticMapper.selectVisitNum(LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), building, targetType, orgId);
 
         map.put("sharePersonNum", sharePersonNum);
         map.put("shareNum", shareNum);
         return taActicityStaticMapper.selectActivityStatisDetailExport(orgId, startDate, endDate, buildingId, targetType, activityName, sortType, colKey);
     }
 
-    public ResponseBean selectActivitySharePersonNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String sharePersonType, String sharePersonName, String sharePhone, String activityId, String activityType, String sort, String colKey){
+    public ResponseBean selectActivitySharePersonNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String sharePersonType, String sharePersonName, String sharePhone, String activityId, String activityType, String buildingId, String sort, String colKey){
         IPage<SharePersonNum> iPage = new Page<>(pageNum, pageSize);
         String sortType = "ascend".equals(sort) ? "asc" : "desc";
 
-        IPage<SharePersonNum> data = taActicityStaticMapper.selectActivitySharePersonNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), sharePersonType, sharePersonName, sharePhone, activityId, activityType, sortType, colKey);
+        IPage<SharePersonNum> data = taActicityStaticMapper.selectActivitySharePersonNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), sharePersonType, sharePersonName, sharePhone, activityId, activityType, buildingId, sortType, colKey);
         return ResponseBean.success(data);
     }
 
         return taActicityStaticMapper.selectActivitySharePersonNumExport(orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), sharePersonType, sharePersonName, sharePhone, sortType, colKey);
     }
 
-    public ResponseBean selectActivityShareNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String sharePersonType, String sharePersonName, String sharePhone, String activityId, String activityType, String personId, String sort, String colKey){
+    public ResponseBean selectActivityShareNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String sharePersonType, String sharePersonName, String sharePhone, String activityId, String activityType, String personId, String buildingId, String sort, String colKey){
         IPage<ShareNum> iPage = new Page<>(pageNum, pageSize);
         String sortType = "ascend".equals(sort) ? "asc" : "desc";
 
-        IPage<ShareNum> data = taActicityStaticMapper.selectActivityShareNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), sharePersonType, sharePersonName, sharePhone, activityId, activityType, personId, sortType, colKey);
+        IPage<ShareNum> data = taActicityStaticMapper.selectActivityShareNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), sharePersonType, sharePersonName, sharePhone, activityId, activityType, personId, buildingId, sortType, colKey);
         return ResponseBean.success(data);
     }
 

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

 <mapper namespace="com.huiju.estateagents.statistic.mapper.TaActicityStaticMapper">
 
     <select id="selectSharePersonNum" resultType="java.lang.Integer">
-        select count(*) 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}
+        SELECT count(1) as sharePersonNum
+        FROM (
+        SELECT count(DISTINCT(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 test="startDate != null ">
+            and t.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
-        <if test="endDate != null">
-            and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
+        <if test="endDate != null ">
+            and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
+        </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 temp1
     </select>
 
     <select id="selectShareNum" resultType="java.lang.Integer">
-        select count(*) from (
-        select DISTINCT t.person_id From ta_share_count t
+        SELECT
+        COUNT( 1 ) AS shareNum
+        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}
+        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 test="startDate != null ">
+            and t.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
-        <if test="endDate != null">
-            and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
+        <if test="endDate != null ">
+            and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
+        </if>
+        <if test="startDate == null or endDate == null ">
+            AND t.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
-        ) c
     </select>
 
     <select id="selectVisitPersonNum" resultType="java.lang.Integer">
-        select count(*) from ta_person_visit_record t
-        where t.`event` = 'detail'  and t.event_type in ('activity','help','group','h5') and t.org_id = #{orgId}
+        select  count(*)AS visitPersonNum from (
+        SELECT
+        t.visit_time AS create_date,
+        t.person_id
+        FROM
+        ta_person_visit_record t
+        WHERE
+        t.`event` = 'detail'  and t.event_type in ('activity','help','group','h5') and t.org_id = #{orgId}
         <if test="buildingId != null and buildingId != ''">
-           and t.building_id = #{buildingId}
+            and t.building_id =  #{buildingId}
         </if>
         <if test="targetType != null and targetType != ''">
-            and t.target_type = #{targetType}
+            and (case when #{targetType} = 'activity' then t.target_type = 'dynamic' else t.target_type = #{targetType} end)
         </if>
         <if test="startDate != null">
-            and t.visit_time &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d' )
+            and t.visit_time &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="endDate != null">
-            and t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
+            and t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
+        </if>
+        <if test="startDate == null or endDate == null">
+            AND t.visit_time BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
+        GROUP BY
+        DATE_FORMAT(t.visit_time, '%Y-%m-%d'),
+        person_id) as visitPersonCount
     </select>
 
     <select id="selectVisitNum" resultType="java.lang.Integer">
-        select count(*) From (
-        select DISTINCT t.person_id from ta_person_visit_record t where t.`event` = 'detail'  and t.event_type in ('activity','help','group','h5') and t.org_id = #{orgId}
+        select count(*) from ta_person_visit_record t where t.`event` = 'detail'  and t.event_type in ('activity','help','group','h5') and t.org_id = #{orgId}
         <if test="buildingId != null and buildingId != ''">
             and t.building_id = #{buildingId}
         </if>
         <if test="targetType != null and targetType != ''">
-            and t.target_type = #{targetType}
+            and (case when #{targetType} = 'activity' then t.target_type = 'dynamic' else t.target_type = #{targetType} end)
         </if>
         <if test="startDate != null">
-            and t.visit_time &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d' )
+            and t.visit_time &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="endDate != null">
-            and t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
+            and t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
-        ) c;
     </select>
 
     <select id="selectShareCount" resultType="java.util.Map">
             select count(*) as addRegistNum ,addRegistNum.target_id, addRegistNum.target_type From (
                 select  count(*), a.* From ta_share_person_from a where a.target_type IN ( 'dynamic_share', 'h5_share', 'help_share', 'live_share', 'group_share' )  and a.org_id = #{orgId}
                 and a.status = 1
+                and t.is_first_time = 1
                 <if test="targetType != null and targetType != ''">
                     and a.target_type =  #{targetType}
                 </if>
         select count(*) as addRegistNum ,addRegistNum.target_id, addRegistNum.target_type From (
         select  count(*), a.* From ta_share_person_from a where a.target_type IN ( 'dynamic_share', 'h5_share', 'help_share', 'live_share', 'group_share' )  and a.org_id = #{orgId}
         and a.status = 1
+        and a.is_first_time = 1
         <if test="startDate != null ">
             and a.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d' )
         </if>
             ON t.person_id = f.person_id
             WHERE t.tagert_type in ('activity','group','h5','help','liveApp','livePost') and t.org_id = #{orgId}
             and t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%I:%S' ) and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%I:%S' )
+            <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="activityId != null and activityId != ''">
                 and t.be_share = #{activityId}
             </if>
         when person.person_type = 'customer' then '客户'
         when person.person_type = 'drift' then '游客'
         when person.person_type = 'Realty Consultant' then '置业顾问'
-        end as sharePersonType from (
+        end as sharePersonType,
+        person.person_id
+        from (
         SELECT t.*, f.nickname, f.phone, f.person_type
         FROM ta_share_count t
         LEFT JOIN ta_help_activity a
         ON t.person_id = f.person_id
         WHERE t.tagert_type in ('activity','group','h5','help','liveApp','livePost') and t.org_id = #{orgId}
         and t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%I:%S' ) and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%I:%S' )
+        <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="activityId != null and activityId != ''">
+            and t.be_share = #{activityId}
+        </if>
+        <if test="activityType != null and activityType != ''">
+            and t.tagert_type = #{activityType}
+        </if>
         <if test="sharePersonType != null and sharePersonType != ''">
             and f.person_type = #{sharePersonType}
         </if>
         <if test="sharePhone != null and sharePhone != ''">
             and f.phone = #{sharePhone}
         </if>
-        GROUP BY t.person_id, t.person_id
+        GROUP BY t.person_id
         ) as person
 
         left join (
         ) as visitNum on visitNum.person_id = person.person_id
 
         left join (
-            select count(1) as visitPersonNum, visitNum.share_person as person_id From (
-                select count(1), t.share_person From ta_share_person_from t
-                left join
-                (
-                    select a.person_id, b.user_id From ta_person a left join ta_user b on a.user_id = b.user_id where a.org_id = #{orgId}
-                ) as a on t.share_person = a.person_id or t.share_person = a.user_id
-                where t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%I:%S' ) and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%I:%S' )
-                and t.target_type in ('dynamic_share','h5_share','help_share','live_share', 'group_share')
-                group by  t.person_id, t.share_person
-            ) as visitNum group by visitNum.share_person
+        select count(1) as visitPersonNum, visitNum.share_person as person_id From (
+        select count(1), t.share_person From ta_share_person_from t
+        left join
+        (
+        select a.person_id, b.user_id From ta_person a left join ta_user b on a.user_id = b.user_id where a.org_id = #{orgId}
+        ) as a on t.share_person = a.person_id or t.share_person = a.user_id
+        where t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%I:%S' ) and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%I:%S' )
+        and t.target_type in ('dynamic_share','h5_share','help_share','live_share', 'group_share')
+        group by  t.person_id, t.share_person
+        ) as visitNum group by visitNum.share_person
         ) as visitPersonNum on visitPersonNum.person_id = person.person_id
         <if test="colKey == null or colKey == ''">
             order by person.create_date desc
             <if test="activityType != null and activityType != ''">
                 and t.tagert_type = #{activityType}
             </if>
+            <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>
             and t.org_id = #{orgId}
             and t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%I:%S' )
             and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%I:%S' )
         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="activityId != null and activityId != ''">
+            and t.be_share = #{activityId}
+        </if>
+        <if test="activityType != null and activityType != ''">
+            and t.tagert_type = #{activityType}
+        </if>
+        <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>
+        and t.org_id = #{orgId}
         and t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%I:%S' )
         and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%I:%S' )
+        <if test="personId != null and personId != ''">
+            and t.person_id = #{personId}
+        </if>
         ) as person
         LEFT JOIN (
         SELECT count(*) as visitPersonNum,t.share_person as person_id
         FROM ta_share_person_from t
-        where  t.target_type in ('dynamic_share','h5_share','help_share','live_share', 'group_share') and t.org_id = #{orgId} group by t.person_id
+        where  t.target_type in ('dynamic_share','h5_share','help_share','live_share', 'group_share') and t.org_id = #{orgId}
+        <if test="personId != null and personId != ''">
+            and t.share_person = #{personId}
+        </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>
         ) as visitPersonNum
         ON visitPersonNum.person_id = person.person_id order by person.create_date desc
     </select>
         left join ta_person d on c.recommend_person = d.person_id
         left join ta_person e on t.share_person = e.person_id
         left join ta_user f on t.share_person = f.user_id
-        WHERE t.target_type in ('dynamic_share','h5_share','help_share','live_share', 'group_share') and t.org_id = #{orgId} and t.status = 1
+        WHERE t.target_type in ('dynamic_share','h5_share','help_share','live_share', 'group_share') and t.org_id = #{orgId}
+        and t.status = 1
+        and t.is_first_time = 1
         and t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d' ) and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
         <if test="personFrom != null and personFrom != ''">
             and b.scene_id = #{personFrom}