报表bug 修复

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,getInstitutionIds(request));
+        return iStatisticalService.changeNewsUserCount(getOrgId(request), startDate, endDate,null);
     }
 
     /**
@@ -267,7 +267,7 @@ public class StatisticalController extends BaseController {
                                                 @RequestParam(value = "sortField", required = false) String sortField,
                                                 @RequestParam(value = "sortOrder", required = false) String sortOrder,
                                                 HttpServletRequest request) {
-        return iStatisticalService.getStatsTableList(pageNum,pageSize,getOrgId(request), startDate, endDate,buildingId, getTaPersonBuildingListByUserId(request),sortField,sortOrder);
+        return iStatisticalService.getStatsTableList(pageNum,pageSize,getOrgId(request), startDate, endDate,buildingId, getTaPersonBuildingListByUserId(request),sortField,sortOrder,getInstitutionIds(request));
     }
 
     /**

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

@@ -153,7 +153,7 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
      * @param personBuildingList
      * @return
      */
-    IPage<StatsBuilding> getStatsTableList(IPage<StatsBuilding> page, @Param("orgId") Integer orgId, @Param("startDate")  LocalDate startDate, @Param("endDate")  LocalDate endDate, @Param("buildingId") String buildingId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("sortField") String sortField,@Param("orderType") String orderType);
+    IPage<StatsBuilding> getStatsTableList(IPage<StatsBuilding> page, @Param("orgId") Integer orgId, @Param("startDate")  LocalDate startDate, @Param("endDate")  LocalDate endDate, @Param("buildingId") String buildingId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("sortField") String sortField,@Param("orderType") String orderType,@Param("institutionIds") List<String> institutionIds);
 
     /**
      * 获取导出的数据

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

@@ -148,7 +148,7 @@ public interface IStatisticalService {
      * @param taPersonBuildingListByUserId
      * @return
      */
-    ResponseBean getStatsTableList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId,String sortField,String sortOrder);
+    ResponseBean getStatsTableList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId,String sortField,String sortOrder,List<String> inistions);
 
     /**
      * 获取需要导出的数据

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

@@ -455,7 +455,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
      * @return
      */
     @Override
-    public ResponseBean getStatsTableList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> personBuildingList,String sortField,String sortOrder) {
+    public ResponseBean getStatsTableList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> personBuildingList,String sortField,String sortOrder,List<String> institutionIds) {
         String orderType = "asc";
         if ("descend".equals(sortOrder)){
             orderType = "desc";
@@ -467,7 +467,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
             orderType = "desc";
         }
         IPage<StatsBuilding> pg = new Page<>(pageNum, pageSize);
-        IPage<StatsBuilding> page = taBuildingMapper.getStatsTableList(pg, orgId, startDate, endDate, buildingId, personBuildingList,sortField,orderType);
+        IPage<StatsBuilding> page = taBuildingMapper.getStatsTableList(pg, orgId, startDate, endDate, buildingId, personBuildingList,sortField,orderType,institutionIds);
         return ResponseBean.success(page);
     }
 

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,getInstitutionIds(request));
+        return iTsUserBehaviorStatisticService.selectUserBehavior(orgId, startDate, endDate, buildingId,null);
     }
 }

src/main/resources/mapper/TaPersonFromRecordMapper.xml

@@ -9,19 +9,16 @@
             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,
-            b.institution_id
+            sum( IF ( p.phone IS NOT NULL OR p.tel IS NOT NULL, 1, 0 ) ) AS registered_num
         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,
-            b.institution_id
+            t.org_id
     </select>
 </mapper>