报表bug 修复

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

@@ -285,7 +285,7 @@ public class StatisticalController extends BaseController {
         ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), StatsBuilding.class).registerWriteHandler(new CustomCellWriteHandler()).build();
         // 设置 sheet, 同一个sheet只需要设置一次
         WriteSheet writeSheet = EasyExcel.writerSheet("项目统计").build();
-        List<StatsBuilding> list = iStatisticalService.getExportTableList(getOrgId(request), startDate, endDate,buildingId, getTaPersonBuildingListByUserId(request));
+        List<StatsBuilding> list = iStatisticalService.getExportTableList(getOrgId(request), startDate, endDate,buildingId, getTaPersonBuildingListByUserId(request),getInstitutionIds(request));
         excelWriter.write(list, writeSheet);
         // finish 会帮忙关闭流
         excelWriter.finish();

src/main/java/com/yunzhi/marketing/excel/StatsBuilding.java

@@ -47,8 +47,8 @@ public class StatsBuilding {
      * 观看次数
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "访问次数", index = 5)
-    private Integer pvNum;
+    @ExcelProperty(value = "成交量", index = 5)
+    private Integer cjNum;
 
 
     @ExcelIgnore

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

@@ -164,7 +164,7 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
      * @param personBuildingList
      * @return
      */
-    List<StatsBuilding> getExportTableList(@Param("orgId") Integer orgId, @Param("startDate")  LocalDate startDate, @Param("endDate")  LocalDate endDate, @Param("buildingId") String buildingId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+    List<StatsBuilding> getExportTableList(@Param("orgId") Integer orgId, @Param("startDate")  LocalDate startDate, @Param("endDate")  LocalDate endDate, @Param("buildingId") String buildingId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("institutionIds") List<String> institutionIds);
 
     /**
      * 获取单独building的折线图数据

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

@@ -159,7 +159,7 @@ public interface IStatisticalService {
      * @param taPersonBuildingListByUserId
      * @return
      */
-    List<StatsBuilding> getExportTableList(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId);
+    List<StatsBuilding> getExportTableList(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId,List<String> institutionIds);
 
     /**
      * 按时间获取此楼盘的数据折线图

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

@@ -482,8 +482,8 @@ public class StatisticalServiceImpl implements IStatisticalService {
      * @return
      */
     @Override
-    public List<StatsBuilding> getExportTableList(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> personBuildingList) {
-        return taBuildingMapper.getExportTableList(orgId, startDate, endDate, buildingId, personBuildingList);
+    public List<StatsBuilding> getExportTableList(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> personBuildingList,List<String> institutionIds) {
+        return taBuildingMapper.getExportTableList(orgId, startDate, endDate, buildingId, personBuildingList,institutionIds);
     }
 
     /**

src/main/resources/mapper/TaBuildingMapper.xml

@@ -458,6 +458,7 @@
             IFNULL( uu.uv_num, 0 ) AS uv_num,
             IFNULL( aa.sk_num, 0 ) AS sk_num,
             IFNULL( bbb.gk_num, 0 ) AS gk_num,
+            IFNULL( s.cj_num, 0 ) AS cj_num,
             IFNULL( aa.sk_num, 0 ) + IFNULL( bbb.gk_num, 0 ) AS kh_num
         FROM
             ta_building t
@@ -528,6 +529,18 @@
             GROUP BY
                 u.be_uv
         ) uu ON uu.building_id = t.building_id
+        LEFT JOIN (
+            SELECT count( * ) AS cj_num,
+                building_id
+            FROM
+                xlk_customer_signatory WHERE type = 'signatory' AND org_id = #{orgId}
+        <if test="startDate != null">
+            and  TO_DAYS(create_date) >= TO_DAYS(#{startDate})
+        </if>
+        <if test="endDate != null">
+            and  TO_DAYS(create_date) &lt;= TO_DAYS(#{endDate})
+        </if>
+        GROUP BY building_id ) s ON s.building_id = t.building_id
         WHERE
         t.org_id = #{orgId}
         <if test="personBuildingList != null and personBuildingList.size > 0">
@@ -557,6 +570,7 @@
         IFNULL( uu.uv_num, 0 ) AS uv_num,
         IFNULL( aa.sk_num, 0 ) AS sk_num,
         IFNULL( bbb.gk_num, 0 ) AS gk_num,
+        IFNULL( s.cj_num, 0 ) AS cj_num,
         IFNULL( aa.sk_num, 0 ) + IFNULL( bbb.gk_num, 0 ) AS kh_num
         FROM
         ta_building t
@@ -627,6 +641,18 @@
         GROUP BY
         u.be_uv
         ) uu ON uu.building_id = t.building_id
+        LEFT JOIN (
+        SELECT count( * ) AS cj_num,
+        building_id
+        FROM
+        xlk_customer_signatory WHERE type = 'signatory' AND org_id = #{orgId}
+        <if test="startDate != null">
+            and  TO_DAYS(create_date) >= TO_DAYS(#{startDate})
+        </if>
+        <if test="endDate != null">
+            and  TO_DAYS(create_date) &lt;= TO_DAYS(#{endDate})
+        </if>
+        GROUP BY building_id ) s ON s.building_id = t.building_id
         WHERE
         t.org_id = #{orgId}
         <if test="personBuildingList != null and personBuildingList.size > 0">
@@ -635,6 +661,12 @@
                 #{personBuilding.buildingId}
             </foreach>
         </if>
+        <if test="institutionIds != null and institutionIds.size > 0">
+            AND t.institution_id in
+            <foreach collection="institutionIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="buildingId != null and buildingId != '' ">
             AND t.building_id = #{buildingId}
         </if>