修改bug数据统计相关

src/main/java/com/yunzhi/marketing/base/BaseController.java

@@ -131,7 +131,11 @@ public class BaseController {
     public List<String> getInstitutionIds(HttpServletRequest request) {
         TaUser taUser = taUserService.getById(getUserId(request));
         List<Institution> list = iInstitutionService.getAllByUser(taUser);
-        return list.stream().map(Institution::getInstitutionId).collect(Collectors.toList());
+        List<String> institutions = list.stream().map(Institution::getInstitutionId).collect(Collectors.toList());
+        if (institutions.contains("01")) {
+            return null;
+        }
+        return institutions;
     }
 
     /**

src/main/java/com/yunzhi/marketing/controller/StatisticalController.java

@@ -77,7 +77,7 @@ public class StatisticalController extends BaseController {
     public ResponseBean changeNewsUserCount(@RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
                                             @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)  LocalDate endDate,
                                             HttpServletRequest request) {
-        return iStatisticalService.changeNewsUserCount(getOrgId(request), startDate, endDate);
+        return iStatisticalService.changeNewsUserCount(getOrgId(request), startDate, endDate,getInstitutionIds(request));
     }
 
     /**
@@ -198,7 +198,7 @@ public class StatisticalController extends BaseController {
                                             @RequestParam(value = "pageSize", defaultValue = "2") Integer pageSize,
                                             @RequestParam(value = "buildingId", required = false) String buildingId,
                                             HttpServletRequest request) {
-        return iStatisticalService.selectIntentionUser(pageNum, pageSize, getOrgId(request), buildingId, getTaPersonBuildingListByUserId(request));
+        return iStatisticalService.selectIntentionUser(pageNum, pageSize, getOrgId(request), buildingId, getTaPersonBuildingListByUserId(request), getInstitutionIds(request));
     }
 
     /**
@@ -228,7 +228,7 @@ public class StatisticalController extends BaseController {
     public ResponseBean selectPersonFrom(@RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
                                          @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
                                             HttpServletRequest request) {
-        return iStatisticalService.selectPersonFrom(getOrgId(request), startDate,endDate);
+        return iStatisticalService.selectPersonFrom(getOrgId(request), startDate,endDate,getInstitutionIds(request));
     }
 
     /**
@@ -354,7 +354,7 @@ public class StatisticalController extends BaseController {
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");
         response.setHeader("Content-disposition", "attachment;filename=新增用户.xlsx");
-        ResponseBean responseBean = iStatisticalService.selectPersonFrom(getOrgId(request), startDate, endDate);
+        ResponseBean responseBean = iStatisticalService.selectPersonFrom(getOrgId(request), startDate, endDate,getInstitutionIds(request));
         List<List<String>> headerList = headerList(responseBean.getData());
         List<List<String>> dataList = dataList(responseBean.getData(),userType);
         EasyExcel.write(response.getOutputStream()).head(headerList).sheet("新增用户").doWrite(dataList);

src/main/java/com/yunzhi/marketing/mapper/TaPersonIntentionRecordMapper.java

@@ -35,7 +35,8 @@ public interface TaPersonIntentionRecordMapper extends BaseMapper<TaPersonIntent
     IPage<Map<String, Object>> selectIntentionUser(IPage<Map<String, Object>> page,
                                                    @Param("orgId") Integer orgId,
                                                    @Param("buildingId") String buildingId,
-                                                   @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+                                                   @Param("personBuildingList") List<TaPersonBuilding> personBuildingList,
+                                                   @Param("institutionIds") List<String> institutions);
 
     List<IntentionUser> selectExportIntentionUser(@Param("orgId") Integer orgId,@Param("buildingId") String buildingId,@Param("personBuildingList") List<TaPersonBuilding> taPersonBuildingListByUserId);
 }

src/main/java/com/yunzhi/marketing/service/IStatisticalService.java

@@ -109,7 +109,7 @@ public interface IStatisticalService {
      * @param buildingId
      * @return
      */
-    ResponseBean selectIntentionUser(Integer pageNum, Integer pageSize, Integer orgId, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId);
+    ResponseBean selectIntentionUser(Integer pageNum, Integer pageSize, Integer orgId, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId,List<String> institutions);
 
     /**
      * 用户来源数据 首页
@@ -118,7 +118,7 @@ public interface IStatisticalService {
      * @param endDate
      * @return
      */
-    ResponseBean selectPersonFrom(Integer orgId, LocalDate startDate, LocalDate endDate);
+    ResponseBean selectPersonFrom(Integer orgId, LocalDate startDate, LocalDate endDate,List<String> institutions);
 
     /**
      * 用户来源数据统计折线图
@@ -214,7 +214,7 @@ public interface IStatisticalService {
      * @param endDate
      * @return
      */
-    ResponseBean changeNewsUserCount(Integer orgId, LocalDate startDate, LocalDate endDate);
+    ResponseBean changeNewsUserCount(Integer orgId, LocalDate startDate, LocalDate endDate,List<String> institutions);
 
     /**
      * 人员城市分布

src/main/java/com/yunzhi/marketing/service/impl/StatisticalServiceImpl.java

@@ -320,11 +320,11 @@ public class StatisticalServiceImpl implements IStatisticalService {
     }
 
     @Override
-    public ResponseBean selectIntentionUser(Integer pageNum, Integer pageSize, Integer orgId, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId) {
+    public ResponseBean selectIntentionUser(Integer pageNum, Integer pageSize, Integer orgId, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId,List<String> institutions) {
         ResponseBean responseBean = new ResponseBean();
 
         IPage<Map<String, Object>> pg = new Page<>(pageNum, pageSize);
-        IPage<Map<String, Object>> page = taPersonIntentionRecordMapper.selectIntentionUser(pg, orgId, buildingId, taPersonBuildingListByUserId);
+        IPage<Map<String, Object>> page = taPersonIntentionRecordMapper.selectIntentionUser(pg, orgId, buildingId, taPersonBuildingListByUserId,institutions);
 
         responseBean.addSuccess(page);
         return responseBean;
@@ -339,9 +339,9 @@ public class StatisticalServiceImpl implements IStatisticalService {
      * @return
      */
     @Override
-    public ResponseBean selectPersonFrom(Integer orgId, LocalDate startDate, LocalDate endDate) {
+    public ResponseBean selectPersonFrom(Integer orgId, LocalDate startDate, LocalDate endDate,List<String> institutions) {
         ResponseBean responseBean = new ResponseBean();
-        List<TsPersonFromStatistic> list = tsPersonFromStatisticMapper.selectPersonFrom(orgId, startDate, endDate);
+        List<TsPersonFromStatistic> list = tsPersonFromStatisticMapper.selectPersonFrom(orgId, startDate, endDate,institutions);
         QueryWrapper<TdWxDict> tdWxDictQueryWrapper = new QueryWrapper<>();
         tdWxDictQueryWrapper.groupBy("scene_type");
         List<TdWxDict> tdWxDicts = tdWxDictMapper.selectList(tdWxDictQueryWrapper);
@@ -353,7 +353,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
         });
         Map<String, Object> map = new HashMap<>();
         map.put("tdWxDicts", tdWxDicts);
-        List<TsPersonFromStatistic> tableList = tsPersonFromStatisticMapper.selectPersonFromGroupByData(orgId, startDate, endDate);
+        List<TsPersonFromStatistic> tableList = tsPersonFromStatisticMapper.selectPersonFromGroupByData(orgId, startDate, endDate,institutions);
         map.put("list", tableList);
         responseBean.addSuccess(map);
         return responseBean;
@@ -585,8 +585,8 @@ public class StatisticalServiceImpl implements IStatisticalService {
      * @return
      */
     @Override
-    public ResponseBean changeNewsUserCount(Integer orgId, LocalDate startDate, LocalDate endDate) {
-        List<TsPersonFromStatistic> tableList = tsPersonFromStatisticMapper.selectNewLinePersonFromGroupByData(orgId, startDate, endDate);
+    public ResponseBean changeNewsUserCount(Integer orgId, LocalDate startDate, LocalDate endDate,List<String> institutions) {
+        List<TsPersonFromStatistic> tableList = tsPersonFromStatisticMapper.selectNewLinePersonFromGroupByData(orgId, startDate, endDate,institutions);
         return ResponseBean.success(tableList);
     }
 

src/main/java/com/yunzhi/marketing/statistic/controller/TsUserBehaviorStatisticController.java

@@ -158,6 +158,6 @@ public class TsUserBehaviorStatisticController extends BaseController {
                                            @RequestParam(value = "org", required = false) String org,
                                            HttpServletRequest request) {
         Integer orgId = StringUtils.isEmpty(org) ? getOrgId(request) : Integer.valueOf(org);
-        return iTsUserBehaviorStatisticService.selectUserBehavior(orgId, startDate, endDate, buildingId);
+        return iTsUserBehaviorStatisticService.selectUserBehavior(orgId, startDate, endDate, buildingId,getInstitutionIds(request));
     }
 }

src/main/java/com/yunzhi/marketing/statistic/entity/TsPersonFromStatistic.java

@@ -66,4 +66,9 @@ public class TsPersonFromStatistic implements Serializable {
      */
     @TableField(exist = false)
     private String createTime;
+
+    /**
+     * 组织机构id
+     */
+    private String institutionId;
 }

src/main/java/com/yunzhi/marketing/statistic/entity/TsUserBehaviorStatistic.java

@@ -60,5 +60,8 @@ public class TsUserBehaviorStatistic implements Serializable {
      */
     private LocalDateTime createDate;
 
-
+    /**
+     * 组织机构id
+     */
+    private String institutionId;
 }

src/main/java/com/yunzhi/marketing/statistic/mapper/TsPersonFromStatisticMapper.java

@@ -21,13 +21,13 @@ public interface TsPersonFromStatisticMapper extends BaseMapper<TsPersonFromStat
 
     void insertStatisticList(List<TsPersonFromStatistic> list);
 
-    List<TsPersonFromStatistic> selectPersonFrom(@Param("orgId") Integer orgId, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate);
+    List<TsPersonFromStatistic> selectPersonFrom(@Param("orgId") Integer orgId, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate,@Param("institutionIds") List<String> institutions);
 
     List<TsPersonFromStatistic> selectPersonFromGroupByDay(@Param("orgId") Integer orgId, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate);
 
-    List<TsPersonFromStatistic> selectPersonFromGroupByData(@Param("orgId") Integer orgId, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate);
+    List<TsPersonFromStatistic> selectPersonFromGroupByData(@Param("orgId") Integer orgId, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate,@Param("institutionIds") List<String> institutions);
 
     void deleteByData();
 
-    List<TsPersonFromStatistic> selectNewLinePersonFromGroupByData(@Param("orgId") Integer orgId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
+    List<TsPersonFromStatistic> selectNewLinePersonFromGroupByData(@Param("orgId") Integer orgId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate,@Param("institutionIds") List<String> institutions);
 }

src/main/java/com/yunzhi/marketing/statistic/mapper/TsUserBehaviorStatisticMapper.java

@@ -24,5 +24,5 @@ public interface TsUserBehaviorStatisticMapper extends BaseMapper<TsUserBehavior
 
     int deleteByDate();
 
-    List<PersonPO>  seleBehaviorListByDate(@Param("orgId") Integer orgId, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate, @Param("buildingId") String buildingId);
+    List<PersonPO>  seleBehaviorListByDate(@Param("orgId") Integer orgId, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate, @Param("buildingId") String buildingId,@Param("institutionIds") List<String> institutions);
 }

src/main/java/com/yunzhi/marketing/statistic/service/ITsUserBehaviorStatisticService.java

@@ -5,6 +5,7 @@ import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.statistic.entity.TsUserBehaviorStatistic;
 
 import java.time.LocalDate;
+import java.util.List;
 
 /**
  * <p>
@@ -26,5 +27,5 @@ public interface ITsUserBehaviorStatisticService extends IService<TsUserBehavior
      * @param buildingId
      * @return
      */
-    ResponseBean selectUserBehavior(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId);
+    ResponseBean selectUserBehavior(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<String> institutionIds);
 }

src/main/java/com/yunzhi/marketing/statistic/service/impl/TsUserBehaviorStatisticServiceImpl.java

@@ -52,9 +52,9 @@ public class TsUserBehaviorStatisticServiceImpl extends ServiceImpl<TsUserBehavi
      * @return
      */
     @Override
-    public ResponseBean selectUserBehavior(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId) {
+    public ResponseBean selectUserBehavior(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<String> institutionIds) {
         ResponseBean responseBean = new ResponseBean();
-        List<PersonPO> tsUserBehaviorStatistics = tsUserBehaviorStatisticMapper.seleBehaviorListByDate(orgId, startDate, endDate, buildingId);
+        List<PersonPO> tsUserBehaviorStatistics = tsUserBehaviorStatisticMapper.seleBehaviorListByDate(orgId, startDate, endDate, buildingId,institutionIds);
         Map<String, Object> map = new HashMap<>();
         map.put("selectUserBehavior", tsUserBehaviorStatistics);
         responseBean.addSuccess(map);

src/main/resources/mapper/TaPersonFromRecordMapper.xml

@@ -9,16 +9,19 @@
             t.event_type,
             t.org_id,
             t.create_date,
-            sum( IF ( p.phone IS NOT NULL OR p.tel IS NOT NULL, 1, 0 ) ) AS registered_num
+            sum( IF ( p.phone IS NOT NULL OR p.tel IS NOT NULL, 1, 0 ) ) AS registered_num,
+            b.institution_id
         FROM
             ta_person_from_record t
             LEFT JOIN ta_person p ON t.person_id = p.person_id
+            LEFT JOIN ta_building b on t.building_id = b.building_id
         WHERE
             t.is_first_time = 1
             AND DATE_FORMAT( t.create_date, '%Y-%m-%d' ) = DATE_FORMAT( NOW( ), '%Y-%m-%d' )
         GROUP BY
             t.scene_type,
             t.event_type,
-            t.org_id
+            t.org_id,
+            b.institution_id
     </select>
 </mapper>

src/main/resources/mapper/TaPersonIntentionRecordMapper.xml

@@ -23,6 +23,7 @@
         FROM
             ta_person_intention_record tpir
             LEFT JOIN ta_person tp on tpir.person_id = tp.person_id
+            Left join ta_building tb on tpir.building_id = tb.building_id
             <trim prefix="where" prefixOverrides="and | or">
                 <if test="buildingId != null and buildingId != ''">
                     tpir.building_id = #{buildingId}
@@ -37,6 +38,12 @@
                         #{personBuilding.buildingId}
                     </foreach>
                 </if>
+                <if test="institutionIds != null and institutionIds.size > 0">
+                    AND tb.institution_id in
+                    <foreach collection="institutionIds" item="item" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>
+                </if>
             </trim>
         GROUP BY
             tpir.person_id, tpir.building_id

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

@@ -3,10 +3,10 @@
 <mapper namespace="com.yunzhi.marketing.statistic.mapper.TsPersonFromStatisticMapper">
 
     <insert id="insertStatisticList">
-        INSERT INTO ts_person_from_statistic(scene_type,event_type,from_num,org_id,create_date,registered_num)
+        INSERT INTO ts_person_from_statistic(scene_type,event_type,from_num,org_id,create_date,registered_num,institution_id)
         VALUES
         <foreach collection="list" item="item" separator=",">
-            (#{item.sceneType},#{item.eventType},#{item.fromNum},#{item.orgId},#{item.createDate},#{item.registeredNum})
+            (#{item.sceneType},#{item.eventType},#{item.fromNum},#{item.orgId},#{item.createDate},#{item.registeredNum},#{item.institutionId})
         </foreach>
     </insert>
     <delete id="deleteByData">
@@ -24,7 +24,12 @@
         <if test="startDate == null or endDate == null">
             AND DATE_FORMAT( tp.create_date, '%Y-%m-%d' ) BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
-
+        <if test="institutionIds != null and institutionIds.size > 0">
+            AND tp.institution_id in
+            <foreach collection="institutionIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
     </select>
     <select id="selectPersonFromGroupByDay"
             resultType="com.yunzhi.marketing.statistic.entity.TsPersonFromStatistic">
@@ -63,6 +68,12 @@
         <if test="startDate == null or endDate == null">
             AND DATE_FORMAT( tp.create_date, '%Y-%m-%d' ) BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
+        <if test="institutionIds != null and institutionIds.size > 0">
+            AND tp.institution_id in
+            <foreach collection="institutionIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         GROUP BY DATE_FORMAT( tp.create_date, '%Y-%m-%d' ), tp.scene_type ORDER BY tp.create_date
         ) as tp on date.date = tp.create_time
 
@@ -93,6 +104,12 @@
         <if test="startDate == null or endDate == null">
             AND DATE_FORMAT( tp.create_date, '%Y-%m-%d' ) BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
+        <if test="institutionIds != null and institutionIds.size > 0">
+            AND tp.institution_id in
+            <foreach collection="institutionIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         GROUP BY
         DATE_FORMAT( tp.create_date, '%Y-%m-%d' )
         ORDER BY tp.create_date

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

@@ -7,15 +7,16 @@
 
     <select id="seleUserBehaviorList"
             resultType="com.yunzhi.marketing.statistic.entity.TsUserBehaviorStatistic">
-                SELECT
+        SELECT
             temp_date.date AS create_date,
             temp_date.type_name AS event_name,
             temp_date.type_id AS event_type,
             temp.activityCount AS behavior_num,
             temp.building_id,
-            temp.org_id
+            temp.org_id,
+            temp.institution_id
         FROM
-            (
+        (
         SELECT
             DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date,
             b.type_id,
@@ -24,26 +25,30 @@
         FROM
             sequence a,
             td_biz_event_type b
-            ) AS temp_date
-            LEFT JOIN (
-        SELECT
-            COUNT( 1 ) AS activityCount,
-            tpvr.event_type,
-            DATE_FORMAT( tpvr.visit_time, '%Y-%m-%d' ) AS date,
-            tpvr.building_id,
-            tp.org_id
-        FROM
-            ta_person tp
+        ) AS temp_date
+        LEFT JOIN (
+            SELECT
+                COUNT( 1 ) AS activityCount,
+                tpvr.event_type,
+                DATE_FORMAT( tpvr.visit_time, '%Y-%m-%d' ) AS date,
+                tpvr.building_id,
+                tp.org_id,
+                tb.institution_id
+            FROM
+                ta_person tp
             INNER JOIN ta_person_visit_record tpvr ON tp.person_id = tpvr.person_id
+            LEFT JOIN ta_building tb on tpvr.building_id = tb.building_id
+            WHERE
+                tp.person_type IN ( 'customer', 'drift', 'estate agent' )
+            GROUP BY
+                tpvr.event_type,
+                DATE_FORMAT( tpvr.visit_time, '%Y-%m-%d' ),
+                tp.org_id,
+                tpvr.building_id
+        ) AS temp ON temp_date.date = temp.date
+        AND temp_date.type_id = temp.event_type
         WHERE
-            tp.person_type IN ( 'customer', 'drift', 'estate agent' )
-        GROUP BY
-            tpvr.event_type,
-            DATE_FORMAT( tpvr.visit_time, '%Y-%m-%d' ),
-            tp.org_id,
-            tpvr.building_id
-            ) AS temp ON temp_date.date = temp.date
-            AND temp_date.type_id = temp.event_type where temp_date.date = DATE_FORMAT( now( ), '%Y-%m-%d' )
+        temp_date.date = DATE_FORMAT( now( ), '%Y-%m-%d' )
     </select>
     <select id="seleBehaviorListByDate"
             resultType="com.yunzhi.marketing.po.PersonPO">
@@ -84,6 +89,12 @@
             <if test="buildingId != null and buildingId != ''">
                 and tp.building_id = #{buildingId}
             </if>
+            <if test="institutionIds != null and institutionIds.size > 0">
+                AND tp.institution_id in
+                <foreach collection="institutionIds" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
             GROUP BY
             DATE_FORMAT( tp.create_date, '%Y-%m-%d' ),
             tp.event_type