Merge remote-tracking branch 'origin/v3.5' into v3.5

src/main/java/com/huiju/estateagents/common/CommConstant.java

      * 活动以结束
      */
     public static final Integer ACTIVITY_STATUS_FINISH = 2;
+    
+    /**
+     * 客户统计类型：跟进客户
+     */
+	public static final String CUSTOMER_TYPE_FOLLOW = "follow";
+    
+    /**
+     * 客户统计类型：新增客户
+     */
+    public static final String CUSTOMER_TYPE_NEW = "new";
+    
+    /**
+     * 客户统计类型：到访客户
+     */
+    public static final String CUSTOMER_TYPE_VISITE = "visite";
 }

src/main/java/com/huiju/estateagents/job/CustomerStatisticTimeJob.java

+package com.huiju.estateagents.job;
+
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.common.DateUtils;
+import com.huiju.estateagents.service.IHelpActivityService;
+import com.huiju.estateagents.service.IHelpInitiateRecordService;
+import com.huiju.estateagents.service.IHelpRecordService;
+import com.huiju.estateagents.service.ITaBuildingDynamicService;
+import com.huiju.estateagents.service.ITaShareActivityService;
+import com.huiju.estateagents.service.ITaShareChildRecordService;
+import com.huiju.estateagents.service.ITaShareRecordService;
+import com.huiju.estateagents.statistic.service.ITaCustomerGenderStatisticService;
+import com.huiju.estateagents.statistic.service.ITaCustomerStatisticDailyService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author fxf
+ * @Title: CustomerStatisticTimeJob
+ * @Description: 盘客数据分析统计
+ * @date 2019/11/08
+ */
+@Component
+@Configuration
+@EnableScheduling
+public class CustomerStatisticTimeJob extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(CustomerStatisticTimeJob.class);
+
+    @Autowired
+    private ITaCustomerStatisticDailyService customerStatisticDailyService;
+    
+    @Autowired
+    private ITaCustomerGenderStatisticService taCustomerGenderStatisticService;
+
+    /**
+     *
+     * 盘客工具数据统计
+     *
+     * 开启定时任务，每天23:50执行
+     */
+    @Scheduled(cron = "* 50 23 * * ?")
+    private void configureTasks() {
+        LocalDateTime nowDate = LocalDateTime.now();
+    
+        //每天的新增客户统计并入表
+        customerStatisticDailyService.newCustomerStatisticDaily(nowDate);
+        
+        //每天的跟进客户统计并入表
+        customerStatisticDailyService.followUpStatisticDaily(nowDate);
+        
+        //每天的到访客户统计并入表
+        customerStatisticDailyService.visiteStatisticDaily(nowDate);
+    
+        //每天的新增客户性别统计并入表
+        taCustomerGenderStatisticService.newCustomerSexStatisticDaily(nowDate);
+    
+        //每天的跟进客户性别统计并入表
+        taCustomerGenderStatisticService.followUpSexStatisticDaily(nowDate);
+    
+        //每天的到访客户性别统计并入表
+        taCustomerGenderStatisticService.visiteSexStatisticDaily(nowDate);
+    }
+
+}

src/main/java/com/huiju/estateagents/statistic/entity/TaCustomerFollowUpRecord.java

      * 记录内容
      */
     private String recordContent;
-
-
+    
+    /**
+     * 跟进人ID
+     */
+    private Integer followerId;
 }

src/main/java/com/huiju/estateagents/statistic/entity/TaCustomerGenderStatistic.java

      * 更新时间
      */
     private LocalDateTime updateDate;
-
-
+    
+    /**
+     * 客户类型 visite 到访客户， new 新增客户 ，follow跟进客户
+     */
+    private String customerType;
 }

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

 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
  */
 @Mapper
 public interface TaCustomerStatisticDailyMapper extends BaseMapper<TaCustomerStatisticDaily> {
-
+	
+	/**
+	 * 获取当天跟进客户数
+	 * @param nowDate
+	 * @return
+	 */
+	List<TaCustomerStatisticDaily> getFollowUpData(@Param("nowDate") LocalDateTime nowDate);
+	
+	/**
+	 * 获取当天新增客户数
+	 * @param nowDate
+	 * @param status
+	 * @return
+	 */
+	List<TaCustomerStatisticDaily> getNewCustomerData(@Param("nowDate") LocalDateTime nowDate,@Param("status") int status);
+	
+	/**
+	 * 获取当天到访客户数
+	 * @param nowDate
+	 * @param checkin
+	 * @return
+	 */
+	List<TaCustomerStatisticDaily> getVisiteCustomerData(@Param("nowDate") LocalDateTime nowDate,@Param("checkin") int checkin);
 }

src/main/java/com/huiju/estateagents/statistic/service/ITaCustomerGenderStatisticService.java

 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.statistic.entity.TaCustomerGenderStatistic;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 客户分析性别统计表 小程序盘客工具客户分析 服务类
  * @since 2019-11-08
  */
 public interface ITaCustomerGenderStatisticService extends IService<TaCustomerGenderStatistic> {
-
+	
+	/**
+	 * 每天的新增客户性别统计
+	 * @param nowDate
+	 */
+	void newCustomerSexStatisticDaily(LocalDateTime nowDate);
+	
+	/**
+	 * 每天的跟进客户性别统计
+	 * @param nowDate
+	 */
+	void followUpSexStatisticDaily(LocalDateTime nowDate);
+	
+	/**
+	 * 每天的到访客户性别统计
+	 * @param nowDate
+	 */
+	void visiteSexStatisticDaily(LocalDateTime nowDate);
 }

src/main/java/com/huiju/estateagents/statistic/service/ITaCustomerStatisticDailyService.java

 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 客户分析日统计表 小程序盘客工具客户分析 服务类
  * @since 2019-11-08
  */
 public interface ITaCustomerStatisticDailyService extends IService<TaCustomerStatisticDaily> {
-
+	
+	/**
+	 * 每天的跟进客户统计
+	 * @param nowDate
+	 */
+	void followUpStatisticDaily(LocalDateTime nowDate);
+	
+	/**
+	 * 每天的新增客户统计
+	 * @param nowDate
+	 */
+	void newCustomerStatisticDaily(LocalDateTime nowDate);
+	
+	/**
+	 * 每天的到访客户统计
+	 * @param nowDate
+	 */
+	void visiteStatisticDaily(LocalDateTime nowDate);
 }

src/main/java/com/huiju/estateagents/statistic/service/impl/TaCustomerGenderStatisticServiceImpl.java

 import com.huiju.estateagents.statistic.entity.TaCustomerGenderStatistic;
 import com.huiju.estateagents.statistic.mapper.TaCustomerGenderStatisticMapper;
 import com.huiju.estateagents.statistic.service.ITaCustomerGenderStatisticService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 客户分析性别统计表 小程序盘客工具客户分析 服务实现类
  */
 @Service
 public class TaCustomerGenderStatisticServiceImpl extends ServiceImpl<TaCustomerGenderStatisticMapper, TaCustomerGenderStatistic> implements ITaCustomerGenderStatisticService {
-
+	
+	@Autowired
+	private TaCustomerGenderStatisticMapper customerGenderStatisticMapper;
+	
+	/**
+	 * 每天的新增客户性别统计
+	 *
+	 * @param nowDate
+	 */
+	@Override
+	public void newCustomerSexStatisticDaily(LocalDateTime nowDate) {
+	
+	}
+	
+	/**
+	 * 每天的跟进客户性别统计
+	 *
+	 * @param nowDate
+	 */
+	@Override
+	public void followUpSexStatisticDaily(LocalDateTime nowDate) {
+	
+	}
+	
+	/**
+	 * 每天的到访客户性别统计
+	 *
+	 * @param nowDate
+	 */
+	@Override
+	public void visiteSexStatisticDaily(LocalDateTime nowDate) {
+	
+	}
 }

src/main/java/com/huiju/estateagents/statistic/service/impl/TaCustomerStatisticDailyServiceImpl.java

 package com.huiju.estateagents.statistic.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily;
 import com.huiju.estateagents.statistic.mapper.TaCustomerStatisticDailyMapper;
 import com.huiju.estateagents.statistic.service.ITaCustomerStatisticDailyService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 客户分析日统计表 小程序盘客工具客户分析 服务实现类
  */
 @Service
 public class TaCustomerStatisticDailyServiceImpl extends ServiceImpl<TaCustomerStatisticDailyMapper, TaCustomerStatisticDaily> implements ITaCustomerStatisticDailyService {
-
+	
+	@Autowired
+	private TaCustomerStatisticDailyMapper customerStatisticDailyMapper;
+	
+	/**
+	 * 每天的跟进客户统计
+	 *
+	 * @param nowDate
+	 */
+	@Override
+	public void followUpStatisticDaily(LocalDateTime nowDate) {
+		//按当前时间获取当天的跟进客户的数量，多一个客户进行多次跟进行为，只记录一次
+		List<TaCustomerStatisticDaily> list = customerStatisticDailyMapper.getFollowUpData(nowDate);
+		//批量保存
+		statisticDailySaveBatch(list,nowDate,CommConstant.CUSTOMER_TYPE_FOLLOW);
+	}
+	
+	/**
+	 * 每天的新增客户统计
+	 *
+	 * @param nowDate
+	 */
+	@Override
+	public void newCustomerStatisticDaily(LocalDateTime nowDate) {
+		//按当前时间获取当天的新增客户的数量，ta_recommend_customer 表的status 为1 的就是新增客户
+		List<TaCustomerStatisticDaily> list = customerStatisticDailyMapper.getNewCustomerData(nowDate,CommConstant.STATUS_NORMAL);
+		//批量保存
+		statisticDailySaveBatch(list,nowDate,CommConstant.CUSTOMER_TYPE_NEW);
+	}
+	
+	/**
+	 * 每天的到访客户统计
+	 *
+	 * @param nowDate
+	 */
+	@Override
+	public void visiteStatisticDaily(LocalDateTime nowDate) {
+		//按当前时间获取当天的到访客户的数量，同一天同一个项目只记录一次
+		List<TaCustomerStatisticDaily> list = customerStatisticDailyMapper.getVisiteCustomerData(nowDate,CommConstant.STATUS_NORMAL);
+		List<TaCustomerStatisticDaily> saveList = new ArrayList<>();
+		list.forEach(e -> {
+			if (null != e.getOrgId() && !e.getOrgId().equals("null")){
+				saveList.add(e);
+			}
+		});
+		//批量保存
+		statisticDailySaveBatch(saveList,nowDate,CommConstant.CUSTOMER_TYPE_VISITE);
+	}
+	
+	/**
+	 * 批量保存当天的统计数据
+	 * @param list
+	 * @param nowDate
+	 * @param customerType
+	 */
+	private void statisticDailySaveBatch(List<TaCustomerStatisticDaily> list, LocalDateTime nowDate, String customerType) {
+		list.forEach(e -> {
+			e.setCreateDate(nowDate);
+			e.setCustomerType(customerType);
+		});
+		//批量保存
+		this.saveBatch(list);
+	}
 }

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

 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.statistic.mapper.TaCustomerStatisticDailyMapper">
 
+    <select id="getFollowUpData" resultType="com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily">
+        SELECT
+            org_id,
+            count( DISTINCT ( customer_id ) ) as customer_num
+        FROM
+            ta_customer_follow_up_record
+        WHERE
+            date_format( create_date, '%Y-%m-%d' ) = date_format( #{nowDate}, '%Y-%m-%d' )
+        GROUP BY
+            org_id
+    </select>
+
+    <select id="getNewCustomerData" resultType="com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily">
+        SELECT
+            org_id,
+            count( customer_id ) as customer_num
+        FROM
+            ta_recommend_customer
+        WHERE
+            `STATUS` = #{status}
+            AND date_format( create_date, '%Y-%m-%d' ) = date_format( #{nowDate}, '%Y-%m-%d' )
+        GROUP BY
+            org_id
+    </select>
+    <select id="getVisiteCustomerData" resultType="com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily">
+        SELECT
+            count( DISTINCT ( c.customer_id ) ) as customer_num,
+            c.org_id
+        FROM
+            ta_activity_dynamic_enlist t
+            LEFT JOIN ta_recommend_customer c ON t.person_id = c.person_id
+            AND t.building_id = c.building_id
+            AND t.org_id = c.org_id
+        WHERE
+            t.is_checkin = #{checkin}
+            AND date_format( t.create_date, '%Y-%m-%d' ) = date_format( #{nowDate}, '%Y-%m-%d' )
+        GROUP BY
+            c.org_id
+    </select>
 </mapper>