新需求

src/main/java/com/huiju/estateagents/controller/StatisticalController.java

@@ -244,4 +244,33 @@ public class StatisticalController extends BaseController {
         // finish 会帮忙关闭流
         excelWriter.finish();
     }
+
+    /**
+     * 项目排行统计图
+     * @return
+     */
+    @GetMapping(value = "/admin/stats/timeBarList")
+    public ResponseBean selectBuildingTimeBar(@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,
+                                          @RequestParam(value = "buildingId", required = false) String buildingId,
+                                          HttpServletRequest request) {
+        return iStatisticalService.getStatsTimeBarList(getOrgId(request), startDate, endDate, buildingId, getTaPersonBuildingListByUserId(request));
+    }
+
+    /**
+     * 项目排行统计图
+     * @return
+     */
+    @GetMapping(value = "/admin/stats/timeTableList")
+    public ResponseBean selectBuildingTimeTableList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                @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,
+                                                @RequestParam(value = "buildingId", required = false) String buildingId,
+                                                @RequestParam(value = "sortField", required = false) String sortField,
+                                                @RequestParam(value = "sortOrder", required = false) String sortOrder,
+                                                HttpServletRequest request) {
+        return iStatisticalService.getStatsTimeTableList(pageNum,pageSize,getOrgId(request), startDate, endDate,buildingId, getTaPersonBuildingListByUserId(request),sortField,sortOrder);
+    }
+
 }

src/main/java/com/huiju/estateagents/excel/StatsBuilding.java

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.excel;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import lombok.Data;
@@ -50,7 +51,8 @@ public class StatsBuilding {
     private Integer pvNum;
 
 
-
+    @ExcelIgnore
+    private String buildingId;
 
 
 

src/main/java/com/huiju/estateagents/excel/StatsTimeBuilding.java

@@ -0,0 +1,52 @@
+package com.huiju.estateagents.excel;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+@Data
+public class StatsTimeBuilding {
+
+    /**
+     * 日期
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "日期", index = 0)
+    private String createDate;
+
+    /**
+     * 新增客户 公客加私客
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "新增客户", index = 1)
+    private Integer khNum;
+
+    /**
+     * 公客
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "公客", index = 2)
+    private Integer gkNum;
+
+    /**
+     * 私客
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "私客", index = 3)
+    private Integer skNum;
+
+    /**
+     * 观看人数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "访问人数", index = 4)
+    private Integer uvNum;
+
+    @ExcelIgnore
+    private String buildingId;
+
+
+
+
+}

src/main/java/com/huiju/estateagents/mapper/TaBuildingMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.excel.StatsBuilding;
+import com.huiju.estateagents.excel.StatsTimeBuilding;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
@@ -157,4 +158,27 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
      * @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);
+
+    /**
+     * 获取单独building的折线图数据
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @return
+     */
+    List<StatsTimeBuilding> getStatsTimeBarList(@Param("orgId") Integer orgId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate,@Param("buildingId") String buildingId);
+
+    /**
+     * 获取详情数据表格
+     * @param pg
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @param sortField
+     * @param orderType
+     * @return
+     */
+    IPage<StatsTimeBuilding> getStatsTimeTableList(IPage<StatsTimeBuilding> pg,@Param("orgId") Integer orgId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate,@Param("buildingId") String buildingId,@Param("sortField") String sortField,@Param("orderType") String orderType);
 }

src/main/java/com/huiju/estateagents/service/IStatisticalService.java

@@ -158,4 +158,30 @@ public interface IStatisticalService {
      * @return
      */
     List<StatsBuilding> getExportTableList(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId);
+
+    /**
+     * 按时间获取此楼盘的数据折线图
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @param taPersonBuildingListByUserId
+     * @return
+     */
+    ResponseBean getStatsTimeBarList(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId);
+
+    /**
+     * 分页统计楼盘详情数据
+     * @param pageNum
+     * @param pageSize
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @param taPersonBuildingListByUserId
+     * @param sortField
+     * @param sortOrder
+     * @return
+     */
+    ResponseBean getStatsTimeTableList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId, String sortField, String sortOrder);
 }

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

@@ -9,6 +9,7 @@ import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
 import com.huiju.estateagents.entity.TdWxDict;
 import com.huiju.estateagents.excel.StatsBuilding;
+import com.huiju.estateagents.excel.StatsTimeBuilding;
 import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.po.PersonPO;
 import com.huiju.estateagents.service.IStatisticalService;
@@ -474,6 +475,66 @@ public class StatisticalServiceImpl implements IStatisticalService {
         return taBuildingMapper.getExportTableList(orgId, startDate, endDate, buildingId, personBuildingList);
     }
 
+    /**
+     * 按时间获取此楼盘的数据折线图
+     *
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @param taPersonBuildingListByUserId
+     * @return
+     */
+    @Override
+    public ResponseBean getStatsTimeBarList(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId) {
+        Map<String,Object> map = new HashMap<>();
+        List<StatsTimeBuilding> list = taBuildingMapper.getStatsTimeBarList(orgId,startDate,endDate,buildingId);
+        //日期维度
+        List<String> timeList = list.stream().map(StatsTimeBuilding::getCreateDate).collect(Collectors.toList());
+        //公客维度
+        List<Integer> gkList = list.stream().map(StatsTimeBuilding::getGkNum).collect(Collectors.toList());
+        //私客维度
+        List<Integer> skList = list.stream().map(StatsTimeBuilding::getSkNum).collect(Collectors.toList());
+        //新增客户维度
+        List<Integer> khList = list.stream().map(StatsTimeBuilding::getKhNum).collect(Collectors.toList());
+        //访问人数维度
+        List<Integer> uvList = list.stream().map(StatsTimeBuilding::getUvNum).collect(Collectors.toList());
+        map.put("list",list);
+        map.put("timeList",timeList);
+        map.put("gkList",gkList);
+        map.put("skList",skList);
+        map.put("khList",khList);
+        map.put("uvList",uvList);
+        return ResponseBean.success(map);
+    }
+
+    /**
+     * 分页统计楼盘详情数据
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @param taPersonBuildingListByUserId
+     * @param sortField
+     * @param sortOrder
+     * @return
+     */
+    @Override
+    public ResponseBean getStatsTimeTableList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId, String sortField, String sortOrder) {
+        String orderType = "asc";
+        if ("descend".equals(sortOrder)){
+            orderType = "desc";
+        }else if ("ascend".equals(sortOrder)){
+            orderType = "asc";
+        }
+        IPage<StatsTimeBuilding> pg = new Page<>(pageNum, pageSize);
+        IPage<StatsTimeBuilding> page = taBuildingMapper.getStatsTimeTableList(pg, orgId, startDate, endDate, buildingId,sortField,orderType);
+        return ResponseBean.success(page);
+    }
+
     /**
      * 项目公客排行折线图获取
      * @param orgId

src/main/resources/mapper/TaBuildingMapper.xml

@@ -562,9 +562,173 @@
         <if test="buildingId != null and buildingId != '' ">
             AND t.building_id = #{buildingId}
         </if>
-<!--        <if test="sortField != null and sortField != ''">-->
-<!--            ORDER BY ${sortField} ${orderType}-->
-<!--        </if>-->
+    </select>
+    <select id="getStatsTimeBarList" resultType="com.huiju.estateagents.excel.StatsTimeBuilding">
+        SELECT
+            t.date as create_date,
+            IFNULL( s.sk_num, 0 ) AS sk_num,
+            IFNULL( g.gk_num, 0 ) AS gk_num,
+            IFNULL( u.uv_num, 0 ) AS uv_num,
+            IFNULL( s.sk_num, 0 ) + IFNULL( g.gk_num, 0 ) AS kh_num
+        FROM
+        (
+            SELECT
+            DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date
+            FROM
+            sequence a
+            WHERE
+            a.rownum &lt;= datediff( #{endDate}, #{startDate} )
+        ) t
+        LEFT JOIN (
+            SELECT
+                count( * ) AS sk_num,
+                a.building_id,
+                DATE_FORMAT( a.create_date, '%Y-%m-%d' ) AS create_date
+            FROM
+                ta_recommend_customer a
+            WHERE
+                a.STATUS > 0
+                AND a.verify_status = 1
+                AND a.realty_consultant IS NOT NULL
+                AND a.realty_consultant != ''
+                AND a.org_id = #{orgId}
+                AND a.building_id = #{buildingId}
+                <if test="startDate != null">
+                    and  TO_DAYS(a.create_date) >= TO_DAYS(#{startDate})
+                </if>
+                <if test="endDate != null">
+                    and  TO_DAYS(a.create_date) &lt;= TO_DAYS(#{endDate})
+                </if>
+            GROUP BY
+                DATE_FORMAT( a.create_date, '%Y-%m-%d' )
+        ) s ON t.date = s.create_date
+        LEFT JOIN (
+            SELECT
+                count( * ) AS gk_num,
+                b.building_id,
+                DATE_FORMAT( b.create_date, '%Y-%m-%d' ) AS create_date
+            FROM
+                ta_person b
+            WHERE
+                b.STATUS > 0
+                AND b.org_id = #{orgId}
+                AND IFNULL( b.person_type, '' ) IN ( 'estate agent', 'customer' )
+                AND b.person_id NOT IN ( SELECT c.person_id FROM ta_recommend_customer c WHERE c.org_id = 84 AND person_id IS NOT NULL AND person_id != '' )
+                AND b.building_id = #{buildingId}
+                <if test="startDate != null">
+                    and  TO_DAYS(b.create_date) >= TO_DAYS(#{startDate})
+                </if>
+                <if test="endDate != null">
+                    and  TO_DAYS(b.create_date) &lt;= TO_DAYS(#{endDate})
+                </if>
+            GROUP BY
+                b.person_id,
+                DATE_FORMAT( b.create_date, '%Y-%m-%d' )
+        ) g ON t.date = g.create_date
+        LEFT JOIN (
+            SELECT
+                count( * ) AS uv_num,
+                be_uv AS building_id,
+                DATE_FORMAT( create_date, '%Y-%m-%d' ) AS create_date
+            FROM
+                ta_uv
+            WHERE
+                tagert_type = 'project'
+                AND be_uv = #{buildingId}
+                <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
+                DATE_FORMAT( create_date, '%Y-%m-%d' )
+        ) u ON t.date = u.create_date
+    </select>
+    <select id="getStatsTimeTableList" resultType="com.huiju.estateagents.excel.StatsTimeBuilding">
+        SELECT
+        t.date as create_date,
+        IFNULL( s.sk_num, 0 ) AS sk_num,
+        IFNULL( g.gk_num, 0 ) AS gk_num,
+        IFNULL( u.uv_num, 0 ) AS uv_num,
+        IFNULL( s.sk_num, 0 ) + IFNULL( g.gk_num, 0 ) AS kh_num
+        FROM
+        (
+        SELECT
+        DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date
+        FROM
+        sequence a
+        WHERE
+        a.rownum &lt;= datediff( #{endDate}, #{startDate} )
+        ) t
+        LEFT JOIN (
+        SELECT
+        count( * ) AS sk_num,
+        a.building_id,
+        DATE_FORMAT( a.create_date, '%Y-%m-%d' ) AS create_date
+        FROM
+        ta_recommend_customer a
+        WHERE
+        a.STATUS > 0
+        AND a.verify_status = 1
+        AND a.realty_consultant IS NOT NULL
+        AND a.realty_consultant != ''
+        AND a.org_id = #{orgId}
+        AND a.building_id = #{buildingId}
+        <if test="startDate != null">
+            and  TO_DAYS(a.create_date) >= TO_DAYS(#{startDate})
+        </if>
+        <if test="endDate != null">
+            and  TO_DAYS(a.create_date) &lt;= TO_DAYS(#{endDate})
+        </if>
+        GROUP BY
+        DATE_FORMAT( a.create_date, '%Y-%m-%d' )
+        ) s ON t.date = s.create_date
+        LEFT JOIN (
+        SELECT
+        count( * ) AS gk_num,
+        b.building_id,
+        DATE_FORMAT( b.create_date, '%Y-%m-%d' ) AS create_date
+        FROM
+        ta_person b
+        WHERE
+        b.STATUS > 0
+        AND b.org_id = #{orgId}
+        AND IFNULL( b.person_type, '' ) IN ( 'estate agent', 'customer' )
+        AND b.person_id NOT IN ( SELECT c.person_id FROM ta_recommend_customer c WHERE c.org_id = 84 AND person_id IS NOT NULL AND person_id != '' )
+        AND b.building_id = #{buildingId}
+        <if test="startDate != null">
+            and  TO_DAYS(b.create_date) >= TO_DAYS(#{startDate})
+        </if>
+        <if test="endDate != null">
+            and  TO_DAYS(b.create_date) &lt;= TO_DAYS(#{endDate})
+        </if>
+        GROUP BY
+        b.person_id,
+        DATE_FORMAT( b.create_date, '%Y-%m-%d' )
+        ) g ON t.date = g.create_date
+        LEFT JOIN (
+        SELECT
+        count( * ) AS uv_num,
+        be_uv AS building_id,
+        DATE_FORMAT( create_date, '%Y-%m-%d' ) AS create_date
+        FROM
+        ta_uv
+        WHERE
+        tagert_type = 'project'
+        AND be_uv = #{buildingId}
+        <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
+        DATE_FORMAT( create_date, '%Y-%m-%d' )
+        ) u ON t.date = u.create_date
+        <if test="sortField != null and sortField != ''">
+            ORDER BY ${sortField} ${orderType}
+        </if>
     </select>
 
 </mapper>