新增用户折线统计图

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

@@ -5,6 +5,7 @@ import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.excel.IntentionUser;
 import com.huiju.estateagents.excel.StatsBuilding;
 import com.huiju.estateagents.excel.StatsTimeBuilding;
 import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
@@ -64,6 +65,17 @@ public class StatisticalController extends BaseController {
         return iStatisticalService.selectNewsUserCount(getOrgId(request), startDate, endDate);
     }
 
+    /**
+     * 新增用户数
+     * @return
+     */
+    @GetMapping(value = "/admin/changeNewsUserCount")
+    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
@@ -175,6 +187,25 @@ public class StatisticalController extends BaseController {
         return iStatisticalService.selectIntentionUser(pageNum, pageSize, getOrgId(request), buildingId, getTaPersonBuildingListByUserId(request));
     }
 
+    /**
+     * 意向用户 导出
+     * @return
+     */
+    @GetMapping(value = "/admin/exportIntentionUser")
+    public void getBuildingTimeTableList(@RequestParam(value = "buildingId", required = false) String buildingId,
+                                         HttpServletRequest request, HttpServletResponse response) throws IOException {
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=意向客户.xlsx");
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), IntentionUser.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        // 设置 sheet, 同一个sheet只需要设置一次
+        WriteSheet writeSheet = EasyExcel.writerSheet("项目详情统计").build();
+        List<IntentionUser> list = iStatisticalService.getExportIntentionUser(getOrgId(request), buildingId, getTaPersonBuildingListByUserId(request));
+        excelWriter.write(list, writeSheet);
+        // finish 会帮忙关闭流
+        excelWriter.finish();
+    }
+
     /**
      * 用户来源  首页
      * @return

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

@@ -0,0 +1,38 @@
+package com.huiju.estateagents.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+@Data
+public class IntentionUser {
+
+    /**
+     * 用户姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "用户姓名", index = 0)
+    private String personName;
+
+    /**
+     * 手机号
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "手机号", index = 1)
+    private String phone;
+
+    /**
+     * 意向楼盘
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "意向楼盘", index = 2)
+    private String buildingName;
+
+    /**
+     * 意向值
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "意向值", index = 3)
+    private Integer intention;
+
+}

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaPersonIntentionRecord;
+import com.huiju.estateagents.excel.IntentionUser;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -35,4 +36,6 @@ public interface TaPersonIntentionRecordMapper extends BaseMapper<TaPersonIntent
                                                    @Param("orgId") Integer orgId,
                                                    @Param("buildingId") String buildingId,
                                                    @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+
+    List<IntentionUser> selectExportIntentionUser(@Param("orgId") Integer orgId,@Param("buildingId") String buildingId,@Param("personBuildingList") List<TaPersonBuilding> taPersonBuildingListByUserId);
 }

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

@@ -1,17 +1,15 @@
 package com.huiju.estateagents.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaChannel;
 import com.huiju.estateagents.entity.TaPerson;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TaPersonPositon;
 import com.huiju.estateagents.po.PersonPO;
-import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.*;
 
-import java.io.Serializable;
 import java.time.LocalDate;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
@@ -249,4 +247,11 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      * @return
      */
     Integer savePersonPosition(TaPersonPositon record);
+
+    /**
+     * 今日新增人数
+     * @param orgId
+     * @return
+     */
+    Integer selectTodayRecentlyCount(@Param("orgId") Integer orgId, @Param("nowDate") LocalDateTime nowDate);
 }

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.service;
 
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaPersonBuilding;
+import com.huiju.estateagents.excel.IntentionUser;
 import com.huiju.estateagents.excel.StatsBuilding;
 import com.huiju.estateagents.excel.StatsTimeBuilding;
 
@@ -196,4 +197,22 @@ public interface IStatisticalService {
      * @return
      */
     List<StatsTimeBuilding> getExportTimeTableList(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId);
+
+    /**
+     * 意向客户导出
+     * @param orgId
+     * @param buildingId
+     * @param taPersonBuildingListByUserId
+     * @return
+     */
+    List<IntentionUser> getExportIntentionUser(Integer orgId, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId);
+
+    /**
+     * 新调整--新增用户
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    ResponseBean changeNewsUserCount(Integer orgId, LocalDate startDate, LocalDate endDate);
 }

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

@@ -8,6 +8,7 @@ import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
 import com.huiju.estateagents.entity.TdWxDict;
+import com.huiju.estateagents.excel.IntentionUser;
 import com.huiju.estateagents.excel.StatsBuilding;
 import com.huiju.estateagents.excel.StatsTimeBuilding;
 import com.huiju.estateagents.mapper.*;
@@ -20,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
@@ -74,8 +76,8 @@ public class StatisticalServiceImpl implements IStatisticalService {
         // 注册数
         Integer selectRegisteredCount = taPersonMapper.selectRegisteredCount(orgId);
 
-        // 最近七天
-        Integer selectRecentlyCount = taPersonMapper.selectRecentlyCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT, null, null);
+        // 最近七天--> 调整为今日新增
+        Integer selectRecentlyCount = taPersonMapper.selectTodayRecentlyCount(orgId, LocalDateTime.now());
 
         // -------  用户来源 end ------------
 
@@ -550,6 +552,33 @@ public class StatisticalServiceImpl implements IStatisticalService {
         return taBuildingMapper.getStatsTimeBarList(orgId,startDate,endDate,buildingId);
     }
 
+    /**
+     * 意向客户导出
+     *
+     * @param orgId
+     * @param buildingId
+     * @param taPersonBuildingListByUserId
+     * @return
+     */
+    @Override
+    public List<IntentionUser> getExportIntentionUser(Integer orgId, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId) {
+        return taPersonIntentionRecordMapper.selectExportIntentionUser(orgId, buildingId, taPersonBuildingListByUserId);
+    }
+
+    /**
+     * 新调整--新增用户
+     *
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    @Override
+    public ResponseBean changeNewsUserCount(Integer orgId, LocalDate startDate, LocalDate endDate) {
+        List<TsPersonFromStatistic> tableList = tsPersonFromStatisticMapper.selectNewLinePersonFromGroupByData(orgId, startDate, endDate);
+        return ResponseBean.success(tableList);
+    }
+
     /**
      * 项目公客排行折线图获取
      * @param orgId

src/main/java/com/huiju/estateagents/statistic/mapper/TsPersonFromStatisticMapper.java

@@ -28,4 +28,6 @@ public interface TsPersonFromStatisticMapper extends BaseMapper<TsPersonFromStat
     List<TsPersonFromStatistic> selectPersonFromGroupByData(@Param("orgId") Integer orgId, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate);
 
     void deleteByData();
+
+    List<TsPersonFromStatistic> selectNewLinePersonFromGroupByData(@Param("orgId") Integer orgId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
 }

src/main/resources/mapper/TaPersonIntentionRecordMapper.xml

@@ -42,4 +42,32 @@
             tpir.person_id, tpir.building_id
         ORDER BY SUM(tpir.intention) DESC
     </select>
+    <select id="selectExportIntentionUser" resultType="com.huiju.estateagents.excel.IntentionUser">
+        SELECT
+        tpir.person_name as  person_name,
+        tp.phone as phone,
+        tpir.building_name as building_name,
+        SUM(tpir.intention) as intention
+        FROM
+        ta_person_intention_record tpir
+        LEFT JOIN ta_person tp on tpir.person_id = tp.person_id
+        <trim prefix="where" prefixOverrides="and | or">
+            <if test="buildingId != null and buildingId != ''">
+                tpir.building_id = #{buildingId}
+            </if>
+            <if test="orgId != null">
+                AND tpir.org_id = #{orgId}
+                AND tp.org_id = #{orgId}
+            </if>
+            <if test="personBuildingList != null and personBuildingList.size > 0">
+                AND tpir.building_id in
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                    #{personBuilding.buildingId}
+                </foreach>
+            </if>
+        </trim>
+        GROUP BY
+        tpir.person_id, tpir.building_id
+        ORDER BY SUM(tpir.intention) DESC
+    </select>
 </mapper>

src/main/resources/mapper/TaPersonMapper.xml

@@ -605,6 +605,15 @@ FROM
             </if>
                 GROUP BY t.person_id) d
     </select>
+    <select id="selectTodayRecentlyCount" resultType="java.lang.Integer">
+        SELECT
+            COUNT(1) as activity_count
+        FROM
+        ta_person tp
+        where tp.org_id = #{orgId} AND
+        tp.person_type IN ('customer','drift','estate agent')
+        AND DATE_FORMAT(tp.create_date,'%Y-%m-%d') = DATE_FORMAT(#{nowDate},'%Y-%m-%d')
+    </select>
 
     <insert id="savePersonPosition" parameterType="com.huiju.estateagents.entity.TaPersonPositon">
         insert into ta_person_position

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

@@ -66,4 +66,27 @@
         DATE_FORMAT( tp.create_date, '%Y-%m-%d' ),
         tp.scene_type
     </select>
+    <select id="selectNewLinePersonFromGroupByData"
+            resultType="com.huiju.estateagents.statistic.entity.TsPersonFromStatistic">
+        SELECT
+        sum( tp.from_num ) AS from_num,
+        sum( tp.registered_num ) AS registered_num,
+        DATE_FORMAT( tp.create_date, '%Y-%m-%d' ) AS create_time,
+        tp.scene_type
+        FROM
+        ts_person_from_statistic tp
+        WHERE
+        tp.org_id = #{orgId}
+        and tp.scene_type != ''
+        and tp.scene_type is not null
+        <if test="startDate != null or endDate != null">
+            AND  DATE_FORMAT( tp.create_date, '%Y-%m-%d' ) BETWEEN #{startDate} and #{endDate}
+        </if>
+        <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>
+        GROUP BY
+        DATE_FORMAT( tp.create_date, '%Y-%m-%d' )
+        ORDER BY tp.create_date
+    </select>
 </mapper>