合并

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

@@ -42,8 +42,8 @@ public class CustomerStatisticTimeJob extends BaseController {
      *
      * 开启定时任务，每天23:50执行
      */
-    @Scheduled(cron = "00 50 23 * * ?")
-    //@Scheduled(cron = "* 0/5 * * * ?")
+    //@Scheduled(cron = "00 50 23 * * ?")
+    @Scheduled(cron = "* 0/5 * * * ?")
     private void configureTasks() {
         LocalDateTime nowDate = LocalDateTime.now();
     

src/main/java/com/huiju/estateagents/statistic/controller/TsCustomerGenderStatisticController.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.statistic.entity.TsCustomerGenderStatistic;
 import com.huiju.estateagents.statistic.service.ITsCustomerGenderStatisticService;
 import org.slf4j.Logger;
@@ -37,6 +39,9 @@ public class TsCustomerGenderStatisticController extends BaseController {
 
     @Autowired
     public ITsCustomerGenderStatisticService iTaCustomerGenderStatisticService;
+    
+    @Autowired
+    private ITaPersonService taPersonService;
 
 
     /**
@@ -158,10 +163,17 @@ public class TsCustomerGenderStatisticController extends BaseController {
     public ResponseBean wxCustomerGenderStatisticList(@PathVariable(value = "customerType") String customerType, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            //查询当前小程序的男女比统计
+            String openid = getOpenId(request);
+            List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+            if (null == taPersons || taPersons.size() != 1) {
+                return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+            }
+            TaPerson person = taPersons.get(0);
+            //查询当前小程序的当前置业顾问男女比统计
             QueryWrapper<TsCustomerGenderStatistic> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("org_id",getOrgId(request));
             queryWrapper.eq("customer_type",customerType);
+            queryWrapper.eq("realty_consultant",person.getPersonId());
             queryWrapper.orderByDesc("create_date");
      
             List<TsCustomerGenderStatistic> result = iTaCustomerGenderStatisticService.list(queryWrapper);

src/main/java/com/huiju/estateagents/statistic/controller/TsCustomerStatisticDailyController.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.statistic.entity.TsCustomerStatisticDaily;
 import com.huiju.estateagents.statistic.service.ITsCustomerStatisticDailyService;
 import org.slf4j.Logger;
@@ -37,7 +39,9 @@ public class TsCustomerStatisticDailyController extends BaseController {
 
     @Autowired
     public ITsCustomerStatisticDailyService iTaCustomerStatisticDailyService;
-
+    
+    @Autowired
+    private ITaPersonService taPersonService;
 
     /**
      * 分页查询列表
@@ -159,8 +163,14 @@ public class TsCustomerStatisticDailyController extends BaseController {
     public ResponseBean wxCustomerStatisticDailyList(@PathVariable(value = "customerType") String customerType,
                                                      HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
+        String openid = getOpenId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
         try {
-            List<TsCustomerStatisticDaily> list = iTaCustomerStatisticDailyService.getDailyList(customerType,getOrgId(request));
+            List<TsCustomerStatisticDaily> list = iTaCustomerStatisticDailyService.getDailyList(customerType,getOrgId(request),person.getPersonId());
             responseBean.addSuccess(list);
         }catch (Exception e){
             e.printStackTrace();

src/main/java/com/huiju/estateagents/statistic/controller/TsCustomerStatisticMonthlyController.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.statistic.entity.TsCustomerStatisticMonthly;
 import com.huiju.estateagents.statistic.service.ITsCustomerStatisticMonthlyService;
 import org.slf4j.Logger;
@@ -37,8 +39,10 @@ public class TsCustomerStatisticMonthlyController extends BaseController {
 
     @Autowired
     public ITsCustomerStatisticMonthlyService iTaCustomerStatisticMonthlyService;
-
-
+    
+    @Autowired
+    private ITaPersonService taPersonService;
+    
     /**
      * 分页查询列表
      * @param pageNum
@@ -159,9 +163,15 @@ public class TsCustomerStatisticMonthlyController extends BaseController {
     public ResponseBean taCustomerStatisticMonthlyList(@PathVariable(value = "customerType") String customerType,
                                                        HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
+        String openid = getOpenId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
         try {
             //查询月客户分析数据
-            List<TsCustomerStatisticMonthly> result = iTaCustomerStatisticMonthlyService.getCustomerMonthlyList(customerType, getOrgId(request));
+            List<TsCustomerStatisticMonthly> result = iTaCustomerStatisticMonthlyService.getCustomerMonthlyList(customerType, getOrgId(request),person.getPersonId());
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();

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

@@ -24,4 +24,6 @@ public class GenderStatistic {
 	private Integer unknownSum;
 	
 	private BigDecimal unknownPct;
+	
+	private String realtyConsultant;
 }

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

@@ -65,4 +65,9 @@ public class TsCustomerGenderStatistic implements Serializable {
      * 客户类型 visite 到访客户， new 新增客户 ，follow跟进客户
      */
     private String customerType;
+    
+    /**
+     * 置业顾问ID
+     */
+    private String realtyConsultant;
 }

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

@@ -56,6 +56,9 @@ public class TsCustomerStatisticDaily implements Serializable {
      * 日期 格式yyyymmdd例20191111
      */
     private String day;
-
-
+    
+    /**
+     * 置业顾问ID
+     */
+    private String realtyConsultant;
 }

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

@@ -61,6 +61,9 @@ public class TsCustomerStatisticMonthly implements Serializable {
      * 更新时间
      */
     private LocalDateTime updateDate;
-
-
+    
+    /**
+     * 置业顾问ID
+     */
+    private String realtyConsultant;
 }

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

@@ -48,9 +48,10 @@ public interface TsCustomerStatisticDailyMapper extends BaseMapper<TsCustomerSta
 	 * @param orgId
 	 * @param nowDate
 	 * @param beforeDate
+	 * @param personId
 	 * @return
 	 */
-	List<TsCustomerStatisticDaily> getDailyList(@Param("customerType") String customerType, @Param("orgId")  Integer orgId, @Param("nowDate")  LocalDateTime nowDate, @Param("beforeDate")  LocalDateTime beforeDate);
+	List<TsCustomerStatisticDaily> getDailyList(@Param("customerType") String customerType, @Param("orgId") Integer orgId, @Param("nowDate") LocalDateTime nowDate, @Param("beforeDate") LocalDateTime beforeDate,@Param("personId") String personId);
 	
 	int deleteNowDate(@Param("nowDate") LocalDateTime nowDate,@Param("customerType") String customerType);
 }

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

@@ -48,7 +48,8 @@ public interface TsCustomerStatisticMonthlyMapper extends BaseMapper<TsCustomerS
 	 * @param orgId
 	 * @param nowDate
 	 * @param beforeDate
+	 * @param personId
 	 * @return
 	 */
-	List<TsCustomerStatisticMonthly> getMonthlyList(@Param("customerType") String customerType, @Param("orgId") Integer orgId, @Param("nowDate") LocalDateTime nowDate, @Param("beforeDate") LocalDateTime beforeDate);
+	List<TsCustomerStatisticMonthly> getMonthlyList(@Param("customerType") String customerType, @Param("orgId") Integer orgId, @Param("nowDate") LocalDateTime nowDate, @Param("beforeDate") LocalDateTime beforeDate,@Param("personId") String personId);
 }

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

@@ -38,7 +38,8 @@ public interface ITsCustomerStatisticDailyService extends IService<TsCustomerSta
 	 * 获取日统计数据
 	 * @param customerType
 	 * @param orgId
+	 * @param personId
 	 * @return
 	 */
-	List<TsCustomerStatisticDaily> getDailyList(String customerType, Integer orgId);
+	List<TsCustomerStatisticDaily> getDailyList(String customerType, Integer orgId, String personId);
 }

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

@@ -38,7 +38,8 @@ public interface ITsCustomerStatisticMonthlyService extends IService<TsCustomerS
 	 * 查询12个月的客户统计分析数据
 	 * @param customerType
 	 * @param orgId
+	 * @param personId
 	 * @return
 	 */
-	List<TsCustomerStatisticMonthly> getCustomerMonthlyList(String customerType, Integer orgId);
+	List<TsCustomerStatisticMonthly> getCustomerMonthlyList(String customerType, Integer orgId, String personId);
 }

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

@@ -94,6 +94,7 @@ public class TsCustomerGenderStatisticServiceImpl extends ServiceImpl<TsCustomer
 			maleCustomer.setCustomerNum(e.getManSum());
 			maleCustomer.setPercentage(e.getManPct());
 			maleCustomer.setOrgId(e.getOrgId());
+			maleCustomer.setRealtyConsultant(e.getRealtyConsultant());
 			list.add(maleCustomer);
 			
 			TsCustomerGenderStatistic femaleCustomer = new TsCustomerGenderStatistic();
@@ -103,6 +104,7 @@ public class TsCustomerGenderStatisticServiceImpl extends ServiceImpl<TsCustomer
 			femaleCustomer.setCustomerNum(e.getWomanSum());
 			femaleCustomer.setPercentage(e.getWomanPct());
 			femaleCustomer.setOrgId(e.getOrgId());
+			femaleCustomer.setRealtyConsultant(e.getRealtyConsultant());
 			list.add(femaleCustomer);
 			
 			TsCustomerGenderStatistic unknownCustomer = new TsCustomerGenderStatistic();
@@ -112,6 +114,7 @@ public class TsCustomerGenderStatisticServiceImpl extends ServiceImpl<TsCustomer
 			unknownCustomer.setCustomerNum(e.getUnknownSum());
 			unknownCustomer.setPercentage(e.getUnknownPct());
 			unknownCustomer.setOrgId(e.getOrgId());
+			unknownCustomer.setRealtyConsultant(e.getRealtyConsultant());
 			list.add(unknownCustomer);
 		});
 		//批量插入

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

@@ -77,17 +77,18 @@ public class TsCustomerStatisticDailyServiceImpl extends ServiceImpl<TsCustomerS
 	 *
 	 * @param customerType
 	 * @param orgId
+	 * @param personId
 	 * @return
 	 */
 	@Override
-	public List<TsCustomerStatisticDaily> getDailyList(String customerType, Integer orgId) {
+	public List<TsCustomerStatisticDaily> getDailyList(String customerType, Integer orgId, String personId) {
 		//当前日期
 		LocalDateTime nowDate = LocalDateTime.now();
 		//31天前的日期
 		LocalDateTime beforeDate = nowDate.plusDays(-31);
 		//获取31天的日期数据
 
-		List<TsCustomerStatisticDaily> list = customerStatisticDailyMapper.getDailyList(customerType,orgId,nowDate,beforeDate);
+		List<TsCustomerStatisticDaily> list = customerStatisticDailyMapper.getDailyList(customerType,orgId,nowDate,beforeDate,personId);
 		return list;
 	}
 	

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

@@ -76,16 +76,17 @@ public class TsCustomerStatisticMonthlyServiceImpl extends ServiceImpl<TsCustome
 	 *
 	 * @param customerType
 	 * @param orgId
+	 * @param personId
 	 * @return
 	 */
 	@Override
-	public List<TsCustomerStatisticMonthly> getCustomerMonthlyList(String customerType, Integer orgId) {
+	public List<TsCustomerStatisticMonthly> getCustomerMonthlyList(String customerType, Integer orgId, String personId) {
 		//当前日期
 		LocalDateTime nowDate = LocalDateTime.now();
 		//12个月前的日期
 		LocalDateTime beforeDate = nowDate.plusMonths(-12);
 		//获取31天的日期数据
-		List<TsCustomerStatisticMonthly> list = customerStatisticMonthlyMapper.getMonthlyList(customerType,orgId,nowDate,beforeDate);
+		List<TsCustomerStatisticMonthly> list = customerStatisticMonthlyMapper.getMonthlyList(customerType,orgId,nowDate,beforeDate,personId);
 		return list;
 	}
 	

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

@@ -4,7 +4,7 @@
 
     <select id="getNewCustomerSexCount" resultType="com.huiju.estateagents.statistic.entity.GenderStatistic">
         SELECT
-            org_id,
+            org_id,realty_consultant,
             sum(if(sex = 1,1,0)) as man_sum,
             sum(if(sex = 1,1,0))/count(*) as man_pct,
             sum(if(sex = 2,1,0)) as woman_sum,
@@ -15,11 +15,12 @@
             ta_recommend_customer
         WHERE
             `STATUS` = 1
-            GROUP BY org_id
+            GROUP BY org_id,realty_consultant
     </select>
     <select id="getFollowUpSexCount" resultType="com.huiju.estateagents.statistic.entity.GenderStatistic">
         SELECT
             t.org_id,
+            t.follower_id as realty_consultant,
             sum( IF ( t.customer_sex = 1, 1, 0 ) ) AS manSum,
             sum( IF ( t.customer_sex = 1, 1, 0 ) ) / count( * ) AS manPct,
             sum( IF ( t.customer_sex = 2, 1, 0 ) ) AS womanSum,
@@ -29,11 +30,12 @@
         FROM
             ( SELECT * FROM ta_customer_follow_up_record GROUP BY customer_id ) t
         GROUP BY
-            t.org_id
+            t.org_id,t.follower_id
     </select>
     <select id="getVisiteSexCount" resultType="com.huiju.estateagents.statistic.entity.GenderStatistic">
         SELECT
             d.org_id,
+            d.realty_consultant,
             sum( IF ( d.sex = 1, 1, 0 ) ) AS manSum,
             sum( IF ( d.sex = 1, 1, 0 ) ) / count( * ) AS manPct,
             sum( IF ( d.sex = 2, 1, 0 ) ) AS womanSum,
@@ -56,6 +58,6 @@
                     c.customer_id
             ) d
         GROUP BY
-            d.org_id
+            d.org_id,d.realty_consultant
     </select>
 </mapper>

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

@@ -11,31 +11,34 @@
     <select id="getFollowUpData" resultType="com.huiju.estateagents.statistic.entity.TsCustomerStatisticDaily">
         SELECT
             org_id,
-            count( DISTINCT ( customer_id ) ) as customer_num
+            count( DISTINCT ( customer_id ) ) as customer_num,
+            follower_id AS realty_consultant
         FROM
             ta_customer_follow_up_record
         WHERE
             date_format( create_date, '%Y-%m-%d' ) = date_format( #{nowDate}, '%Y-%m-%d' )
         GROUP BY
-            org_id
+            org_id,follower_id
     </select>
 
     <select id="getNewCustomerData" resultType="com.huiju.estateagents.statistic.entity.TsCustomerStatisticDaily">
         SELECT
             org_id,
-            count( customer_id ) as customer_num
+            count( customer_id ) as customer_num,
+			realty_consultant
         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
+            org_id,realty_consultant
     </select>
     <select id="getVisiteCustomerData" resultType="com.huiju.estateagents.statistic.entity.TsCustomerStatisticDaily">
         SELECT
             count( DISTINCT ( c.customer_id ) ) as customer_num,
-            c.org_id
+            c.org_id,
+			c.realty_consultant
         FROM
             ta_activity_dynamic_enlist t
             LEFT JOIN ta_recommend_customer c ON t.person_id = c.person_id
@@ -45,7 +48,7 @@
             t.is_checkin = #{checkin}
             AND date_format( t.create_date, '%Y-%m-%d' ) = date_format( #{nowDate}, '%Y-%m-%d' )
         GROUP BY
-            c.org_id
+            c.org_id,c.realty_consultant
     </select>
 
     <select id="getDailyList" resultType="com.huiju.estateagents.statistic.entity.TsCustomerStatisticDaily">
@@ -56,6 +59,7 @@
         WHERE
           org_id = #{orgId}
         AND customer_type = #{customerType}
+        AND realty_consultant = #{personId}
         AND date_format( create_date, '%Y-%m-%d' ) >= date_format( #{beforeDate}, '%Y-%m-%d' )
         AND date_format( create_date, '%Y-%m-%d' ) &lt;= date_format( #{nowDate}, '%Y-%m-%d' )
         order by `day`

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

@@ -6,33 +6,36 @@
             resultType="com.huiju.estateagents.statistic.entity.TsCustomerStatisticMonthly">
         SELECT
             org_id,
-            count( customer_id ) as customer_num
+            count( customer_id ) as customer_num,
+            realty_consultant
         FROM
             ta_recommend_customer
         WHERE
             `STATUS` = #{status}
             AND date_format( create_date, '%Y-%m' ) = date_format( #{nowDate}, '%Y-%m' )
         GROUP BY
-            org_id
+            org_id,realty_consultant
     </select>
 
     <select id="getFollowUpStatisticMonthly"
             resultType="com.huiju.estateagents.statistic.entity.TsCustomerStatisticMonthly">
         SELECT
             org_id,
-            count( DISTINCT ( customer_id ) ) as customer_num
+            count( DISTINCT ( customer_id ) ) as customer_num,
+            follower_id AS realty_consultant
         FROM
             ta_customer_follow_up_record
         WHERE
             date_format( create_date, '%Y-%m' ) = date_format( #{nowDate}, '%Y-%m' )
         GROUP BY
-            org_id
+            org_id,follower_id
     </select>
     <select id="getVisiteStatisticMonthly"
             resultType="com.huiju.estateagents.statistic.entity.TsCustomerStatisticMonthly">
         SELECT
             count( DISTINCT ( c.customer_id ) ) as customer_num,
-            c.org_id
+            c.org_id,
+            c.realty_consultant
         FROM
             ta_activity_dynamic_enlist t
             LEFT JOIN ta_recommend_customer c ON t.person_id = c.person_id
@@ -42,7 +45,7 @@
             t.is_checkin = #{checkin}
             AND date_format( t.create_date, '%Y-%m' ) = date_format( #{nowDate}, '%Y-%m' )
         GROUP BY
-            c.org_id
+            c.org_id,c.realty_consultant
     </select>
     <select id="getMonthlyList" resultType="com.huiju.estateagents.statistic.entity.TsCustomerStatisticMonthly">
         SELECT
@@ -52,6 +55,7 @@
         WHERE
           org_id = #{orgId}
         AND customer_type = #{customerType}
+        AND realty_consultant = #{personId}
         AND date_format( create_date, '%Y-%m-%d' ) >= date_format( #{beforeDate}, '%Y-%m-%d' )
         AND date_format( create_date, '%Y-%m-%d' ) &lt;= date_format( #{nowDate}, '%Y-%m-%d' )
          order by `month`