Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

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

@@ -8,39 +8,46 @@ import lombok.Data;
 @Data
 public class StatsTimeBuilding {
 
+    /**
+     * 项目名称
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "项目名称", index = 0)
+    private String buildingName;
+
     /**
      * 日期
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "日期", index = 0)
+    @ExcelProperty(value = "日期", index = 1)
     private String createDate;
 
     /**
      * 新增客户 公客加私客
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "新增客户", index = 1)
+    @ExcelProperty(value = "新增客户", index = 2)
     private Integer khNum;
 
     /**
      * 公客
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "公客", index = 2)
+    @ExcelProperty(value = "公客", index = 3)
     private Integer gkNum;
 
     /**
      * 私客
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "私客", index = 3)
+    @ExcelProperty(value = "私客", index = 4)
     private Integer skNum;
 
     /**
      * 观看人数
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "访问人数", index = 4)
+    @ExcelProperty(value = "访问人数", index = 5)
     private Integer uvNum;
 
     @ExcelIgnore

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

@@ -167,7 +167,7 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
      * @param buildingId
      * @return
      */
-    List<StatsTimeBuilding> getStatsTimeBarList(@Param("orgId") Integer orgId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate,@Param("buildingId") String buildingId);
+    List<StatsTimeBuilding> getStatsTimeBarList(@Param("orgId") Integer orgId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate,@Param("buildingId") String buildingId, @Param("buildingName") String buildingName);
 
     /**
      * 获取详情数据表格

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
 import com.huiju.estateagents.entity.TdWxDict;
@@ -493,7 +494,8 @@ public class StatisticalServiceImpl implements IStatisticalService {
     @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);
+        TaBuilding taBuilding = taBuildingMapper.selectById(buildingId);
+        List<StatsTimeBuilding> list = taBuildingMapper.getStatsTimeBarList(orgId,startDate,endDate,buildingId,taBuilding.getBuildingName());
         //日期维度
         List<String> timeList = list.stream().map(StatsTimeBuilding::getCreateDate).collect(Collectors.toList());
         //公客维度
@@ -552,7 +554,8 @@ public class StatisticalServiceImpl implements IStatisticalService {
      */
     @Override
     public List<StatsTimeBuilding> getExportTimeTableList(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId) {
-        return taBuildingMapper.getStatsTimeBarList(orgId,startDate,endDate,buildingId);
+        TaBuilding taBuilding = taBuildingMapper.selectById(buildingId);
+        return taBuildingMapper.getStatsTimeBarList(orgId,startDate,endDate,buildingId,taBuilding.getBuildingName());
     }
 
     /**

src/main/resources/mapper/TaBuildingMapper.xml

@@ -567,6 +567,7 @@
     </select>
     <select id="getStatsTimeBarList" resultType="com.huiju.estateagents.excel.StatsTimeBuilding">
         SELECT
+            #{buildingName} as building_name,
             t.date as create_date,
             IFNULL( s.sk_num, 0 ) AS sk_num,
             IFNULL( g.gk_num, 0 ) AS gk_num,
@@ -646,6 +647,7 @@
             GROUP BY
                 DATE_FORMAT( create_date, '%Y-%m-%d' )
         ) u ON t.date = u.create_date
+        ORDER BY create_date
     </select>
     <select id="getStatsTimeTableList" resultType="com.huiju.estateagents.excel.StatsTimeBuilding">
         SELECT

src/main/resources/mapper/TsConsultantKpiMapper.xml

@@ -158,6 +158,10 @@
         INNER JOIN ta_person t ON t.person_id = e.person_id
         WHERE e.org_id = #{orgId}
         AND e.share_person = #{userId}
+        AND (
+            e.target_type IN ( 'building_share', 'dynamic_share', 'group_share', 'h5_share', 'help_share', 'house_share', 'live_share', 'news_share', 'poster' )
+            or ( e.target_type = 'share' and e.target_id = 'index' )
+        )m
         AND e.create_date BETWEEN #{startDate} and #{endDate}
         <!-- building_id 字段数据不全
         <if test="buildingId != null and buildingId !=''">
@@ -167,6 +171,7 @@
         AND e.is_first_time = 1
 
         AND t.phone is not null
+        AND t.person_type != 'Realty Consultant'
 
 <!--        为了与存储过程一致 -->
 <!--        AND t.`status` = 1-->
@@ -177,7 +182,7 @@
         SELECT
             t.*,
             count( * ) as visit_times,
-            MAX(f.visit_time) as visit_time
+            f.visit_time as visit_time
         FROM
             ta_person t
         INNER JOIN ta_person_visit_record f ON f.org_id = #{orgId} AND f.person_id = t.person_id
@@ -195,8 +200,8 @@
 
 <!--        为了与存储过程一致 -->
 <!--            AND s.`status` = 1-->
-        GROUP BY t.person_id, DATE_FORMAT(t.create_date, '%Y%m%d')
-        ORDER BY t.create_date DESC
+        GROUP BY t.person_id, DATE_FORMAT(f.visit_time, '%Y%m%d')
+        ORDER BY f.visit_time DESC
     </select>
 
     <select id="getConsultantHomePageTimes" resultType="com.huiju.estateagents.entity.TaPerson">
@@ -229,7 +234,7 @@
     <select id="getConsultantChatPersons" resultType="com.huiju.estateagents.entity.TaPerson">
         SELECT
             t.*,
-            max( h.create_date ) AS visit_time
+            h.create_date AS visit_time
         FROM
             ta_person t
         INNER JOIN ta_chat h ON h.send_person = t.person_id
@@ -311,12 +316,16 @@
         SELECT
             t.*,
             count(*) as visit_times,
-            max(e.create_date) as visit_time
+            e.create_date as visit_time
         FROM ta_share_person_from e
         INNER JOIN ta_person t ON t.person_id = e.person_id
         WHERE e.org_id = #{orgId}
             AND e.share_person = #{userId}
             AND e.create_date BETWEEN #{startDate} and #{endDate}
+            AND (
+                e.target_type IN ( 'building_share', 'dynamic_share', 'group_share', 'h5_share', 'help_share', 'house_share', 'live_share', 'news_share', 'poster' )
+                OR ( e.target_type = 'share' AND e.target_id = 'index' )
+            )
             <!-- building_id 字段数据不全
             <if test="buildingId != null and buildingId !=''">
                 AND e.building_id = #{buildingId}