Browse Source

表名修改

傅行帆 5 years ago
parent
commit
0cd6bcf691
19 changed files with 123 additions and 125 deletions
  1. 6
    14
      src/main/java/com/huiju/estateagents/job/CustomerStatisticTimeJob.java
  2. 12
    12
      src/main/java/com/huiju/estateagents/statistic/controller/TsCustomerGenderStatisticController.java
  3. 11
    11
      src/main/java/com/huiju/estateagents/statistic/controller/TsCustomerStatisticDailyController.java
  4. 11
    11
      src/main/java/com/huiju/estateagents/statistic/controller/TsCustomerStatisticMonthlyController.java
  5. 1
    1
      src/main/java/com/huiju/estateagents/statistic/entity/TsCustomerGenderStatistic.java
  6. 6
    1
      src/main/java/com/huiju/estateagents/statistic/entity/TsCustomerStatisticDaily.java
  7. 1
    1
      src/main/java/com/huiju/estateagents/statistic/entity/TsCustomerStatisticMonthly.java
  8. 2
    3
      src/main/java/com/huiju/estateagents/statistic/mapper/TsCustomerGenderStatisticMapper.java
  9. 6
    7
      src/main/java/com/huiju/estateagents/statistic/mapper/TsCustomerStatisticDailyMapper.java
  10. 6
    6
      src/main/java/com/huiju/estateagents/statistic/mapper/TsCustomerStatisticMonthlyMapper.java
  11. 2
    2
      src/main/java/com/huiju/estateagents/statistic/service/ITsCustomerGenderStatisticService.java
  12. 3
    3
      src/main/java/com/huiju/estateagents/statistic/service/ITsCustomerStatisticDailyService.java
  13. 3
    3
      src/main/java/com/huiju/estateagents/statistic/service/ITsCustomerStatisticMonthlyService.java
  14. 10
    10
      src/main/java/com/huiju/estateagents/statistic/service/impl/TsCustomerGenderStatisticServiceImpl.java
  15. 18
    14
      src/main/java/com/huiju/estateagents/statistic/service/impl/TsCustomerStatisticDailyServiceImpl.java
  16. 14
    15
      src/main/java/com/huiju/estateagents/statistic/service/impl/TsCustomerStatisticMonthlyServiceImpl.java
  17. 1
    1
      src/main/resources/mapper/statistic/TsCustomerGenderStatisticMapper.xml
  18. 5
    5
      src/main/resources/mapper/statistic/TsCustomerStatisticDailyMapper.xml
  19. 5
    5
      src/main/resources/mapper/statistic/TsCustomerStatisticMonthlyMapper.xml

+ 6
- 14
src/main/java/com/huiju/estateagents/job/CustomerStatisticTimeJob.java View File

@@ -1,17 +1,9 @@
1 1
 package com.huiju.estateagents.job;
2 2
 
3 3
 import com.huiju.estateagents.base.BaseController;
4
-import com.huiju.estateagents.common.DateUtils;
5
-import com.huiju.estateagents.service.IHelpActivityService;
6
-import com.huiju.estateagents.service.IHelpInitiateRecordService;
7
-import com.huiju.estateagents.service.IHelpRecordService;
8
-import com.huiju.estateagents.service.ITaBuildingDynamicService;
9
-import com.huiju.estateagents.service.ITaShareActivityService;
10
-import com.huiju.estateagents.service.ITaShareChildRecordService;
11
-import com.huiju.estateagents.service.ITaShareRecordService;
12
-import com.huiju.estateagents.statistic.service.ITaCustomerGenderStatisticService;
13
-import com.huiju.estateagents.statistic.service.ITaCustomerStatisticDailyService;
14
-import com.huiju.estateagents.statistic.service.ITaCustomerStatisticMonthlyService;
4
+import com.huiju.estateagents.statistic.service.ITsCustomerGenderStatisticService;
5
+import com.huiju.estateagents.statistic.service.ITsCustomerStatisticDailyService;
6
+import com.huiju.estateagents.statistic.service.ITsCustomerStatisticMonthlyService;
15 7
 import org.slf4j.Logger;
16 8
 import org.slf4j.LoggerFactory;
17 9
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,13 +28,13 @@ public class CustomerStatisticTimeJob extends BaseController {
36 28
     private final Logger logger = LoggerFactory.getLogger(CustomerStatisticTimeJob.class);
37 29
 
38 30
     @Autowired
39
-    private ITaCustomerStatisticDailyService customerStatisticDailyService;
31
+    private ITsCustomerStatisticDailyService customerStatisticDailyService;
40 32
     
41 33
     @Autowired
42
-    private ITaCustomerGenderStatisticService taCustomerGenderStatisticService;
34
+    private ITsCustomerGenderStatisticService taCustomerGenderStatisticService;
43 35
     
44 36
     @Autowired
45
-    private ITaCustomerStatisticMonthlyService customerStatisticMonthlyService;
37
+    private ITsCustomerStatisticMonthlyService customerStatisticMonthlyService;
46 38
 
47 39
     /**
48 40
      *

src/main/java/com/huiju/estateagents/statistic/controller/TaCustomerGenderStatisticController.java → src/main/java/com/huiju/estateagents/statistic/controller/TsCustomerGenderStatisticController.java View File

@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
5 5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 6
 import com.huiju.estateagents.base.BaseController;
7 7
 import com.huiju.estateagents.base.ResponseBean;
8
-import com.huiju.estateagents.statistic.entity.TaCustomerGenderStatistic;
9
-import com.huiju.estateagents.statistic.service.ITaCustomerGenderStatisticService;
8
+import com.huiju.estateagents.statistic.entity.TsCustomerGenderStatistic;
9
+import com.huiju.estateagents.statistic.service.ITsCustomerGenderStatisticService;
10 10
 import org.slf4j.Logger;
11 11
 import org.slf4j.LoggerFactory;
12 12
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,12 +31,12 @@ import java.util.List;
31 31
  */
32 32
 @RestController
33 33
 @RequestMapping("/api")
34
-public class TaCustomerGenderStatisticController extends BaseController {
34
+public class TsCustomerGenderStatisticController extends BaseController {
35 35
 
36
-    private final Logger logger = LoggerFactory.getLogger(TaCustomerGenderStatisticController.class);
36
+    private final Logger logger = LoggerFactory.getLogger(TsCustomerGenderStatisticController.class);
37 37
 
38 38
     @Autowired
39
-    public ITaCustomerGenderStatisticService iTaCustomerGenderStatisticService;
39
+    public ITsCustomerGenderStatisticService iTaCustomerGenderStatisticService;
40 40
 
41 41
 
42 42
     /**
@@ -51,11 +51,11 @@ public class TaCustomerGenderStatisticController extends BaseController {
51 51
         ResponseBean responseBean = new ResponseBean();
52 52
         try {
53 53
             //使用分页插件
54
-		    IPage<TaCustomerGenderStatistic> pg = new Page<>(pageNum, pageSize);
55
-            QueryWrapper<TaCustomerGenderStatistic> queryWrapper = new QueryWrapper<>();
54
+		    IPage<TsCustomerGenderStatistic> pg = new Page<>(pageNum, pageSize);
55
+            QueryWrapper<TsCustomerGenderStatistic> queryWrapper = new QueryWrapper<>();
56 56
             queryWrapper.orderByDesc("create_date");
57 57
 
58
-            IPage<TaCustomerGenderStatistic> result = iTaCustomerGenderStatisticService.page(pg, queryWrapper);
58
+            IPage<TsCustomerGenderStatistic> result = iTaCustomerGenderStatisticService.page(pg, queryWrapper);
59 59
             responseBean.addSuccess(result);
60 60
         }catch (Exception e){
61 61
             e.printStackTrace();
@@ -71,7 +71,7 @@ public class TaCustomerGenderStatisticController extends BaseController {
71 71
      * @return
72 72
      */
73 73
     @RequestMapping(value="/taCustomerGenderStatistic",method= RequestMethod.POST)
74
-    public ResponseBean taCustomerGenderStatisticAdd(@RequestBody TaCustomerGenderStatistic taCustomerGenderStatistic){
74
+    public ResponseBean taCustomerGenderStatisticAdd(@RequestBody TsCustomerGenderStatistic taCustomerGenderStatistic){
75 75
         ResponseBean responseBean = new ResponseBean();
76 76
         try {
77 77
             if (iTaCustomerGenderStatisticService.save(taCustomerGenderStatistic)){
@@ -117,7 +117,7 @@ public class TaCustomerGenderStatisticController extends BaseController {
117 117
      */
118 118
     @RequestMapping(value="/taCustomerGenderStatistic/{id}",method= RequestMethod.PUT)
119 119
     public ResponseBean taCustomerGenderStatisticUpdate(@PathVariable Integer id,
120
-                                        @RequestBody TaCustomerGenderStatistic taCustomerGenderStatistic){
120
+                                        @RequestBody TsCustomerGenderStatistic taCustomerGenderStatistic){
121 121
         ResponseBean responseBean = new ResponseBean();
122 122
         try {
123 123
             if (iTaCustomerGenderStatisticService.updateById(taCustomerGenderStatistic)){
@@ -159,12 +159,12 @@ public class TaCustomerGenderStatisticController extends BaseController {
159 159
         ResponseBean responseBean = new ResponseBean();
160 160
         try {
161 161
             //查询当前小程序的男女比统计
162
-            QueryWrapper<TaCustomerGenderStatistic> queryWrapper = new QueryWrapper<>();
162
+            QueryWrapper<TsCustomerGenderStatistic> queryWrapper = new QueryWrapper<>();
163 163
             queryWrapper.eq("org_id",getOrgId(request));
164 164
             queryWrapper.eq("customer_type",customerType);
165 165
             queryWrapper.orderByDesc("create_date");
166 166
      
167
-            List<TaCustomerGenderStatistic> result = iTaCustomerGenderStatisticService.list(queryWrapper);
167
+            List<TsCustomerGenderStatistic> result = iTaCustomerGenderStatisticService.list(queryWrapper);
168 168
             responseBean.addSuccess(result);
169 169
         }catch (Exception e){
170 170
             e.printStackTrace();

src/main/java/com/huiju/estateagents/statistic/controller/TaCustomerStatisticDailyController.java → src/main/java/com/huiju/estateagents/statistic/controller/TsCustomerStatisticDailyController.java View File

@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
5 5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 6
 import com.huiju.estateagents.base.BaseController;
7 7
 import com.huiju.estateagents.base.ResponseBean;
8
-import com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily;
9
-import com.huiju.estateagents.statistic.service.ITaCustomerStatisticDailyService;
8
+import com.huiju.estateagents.statistic.entity.TsCustomerStatisticDaily;
9
+import com.huiju.estateagents.statistic.service.ITsCustomerStatisticDailyService;
10 10
 import org.slf4j.Logger;
11 11
 import org.slf4j.LoggerFactory;
12 12
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,12 +31,12 @@ import java.util.List;
31 31
  */
32 32
 @RestController
33 33
 @RequestMapping("/api")
34
-public class TaCustomerStatisticDailyController extends BaseController {
34
+public class TsCustomerStatisticDailyController extends BaseController {
35 35
 
36
-    private final Logger logger = LoggerFactory.getLogger(TaCustomerStatisticDailyController.class);
36
+    private final Logger logger = LoggerFactory.getLogger(TsCustomerStatisticDailyController.class);
37 37
 
38 38
     @Autowired
39
-    public ITaCustomerStatisticDailyService iTaCustomerStatisticDailyService;
39
+    public ITsCustomerStatisticDailyService iTaCustomerStatisticDailyService;
40 40
 
41 41
 
42 42
     /**
@@ -51,11 +51,11 @@ public class TaCustomerStatisticDailyController extends BaseController {
51 51
         ResponseBean responseBean = new ResponseBean();
52 52
         try {
53 53
             //使用分页插件
54
-		    IPage<TaCustomerStatisticDaily> pg = new Page<>(pageNum, pageSize);
55
-            QueryWrapper<TaCustomerStatisticDaily> queryWrapper = new QueryWrapper<>();
54
+		    IPage<TsCustomerStatisticDaily> pg = new Page<>(pageNum, pageSize);
55
+            QueryWrapper<TsCustomerStatisticDaily> queryWrapper = new QueryWrapper<>();
56 56
             queryWrapper.orderByDesc("create_date");
57 57
 
58
-            IPage<TaCustomerStatisticDaily> result = iTaCustomerStatisticDailyService.page(pg, queryWrapper);
58
+            IPage<TsCustomerStatisticDaily> result = iTaCustomerStatisticDailyService.page(pg, queryWrapper);
59 59
             responseBean.addSuccess(result);
60 60
         }catch (Exception e){
61 61
             e.printStackTrace();
@@ -71,7 +71,7 @@ public class TaCustomerStatisticDailyController extends BaseController {
71 71
      * @return
72 72
      */
73 73
     @RequestMapping(value="/taCustomerStatisticDaily",method= RequestMethod.POST)
74
-    public ResponseBean taCustomerStatisticDailyAdd(@RequestBody TaCustomerStatisticDaily taCustomerStatisticDaily){
74
+    public ResponseBean taCustomerStatisticDailyAdd(@RequestBody TsCustomerStatisticDaily taCustomerStatisticDaily){
75 75
         ResponseBean responseBean = new ResponseBean();
76 76
         try {
77 77
             if (iTaCustomerStatisticDailyService.save(taCustomerStatisticDaily)){
@@ -117,7 +117,7 @@ public class TaCustomerStatisticDailyController extends BaseController {
117 117
      */
118 118
     @RequestMapping(value="/taCustomerStatisticDaily/{id}",method= RequestMethod.PUT)
119 119
     public ResponseBean taCustomerStatisticDailyUpdate(@PathVariable Integer id,
120
-                                        @RequestBody TaCustomerStatisticDaily taCustomerStatisticDaily){
120
+                                        @RequestBody TsCustomerStatisticDaily taCustomerStatisticDaily){
121 121
         ResponseBean responseBean = new ResponseBean();
122 122
         try {
123 123
             if (iTaCustomerStatisticDailyService.updateById(taCustomerStatisticDaily)){
@@ -160,7 +160,7 @@ public class TaCustomerStatisticDailyController extends BaseController {
160 160
                                                      HttpServletRequest request){
161 161
         ResponseBean responseBean = new ResponseBean();
162 162
         try {
163
-            List<TaCustomerStatisticDaily> list = iTaCustomerStatisticDailyService.getDailyList(customerType,getOrgId(request));
163
+            List<TsCustomerStatisticDaily> list = iTaCustomerStatisticDailyService.getDailyList(customerType,getOrgId(request));
164 164
             responseBean.addSuccess(list);
165 165
         }catch (Exception e){
166 166
             e.printStackTrace();

src/main/java/com/huiju/estateagents/statistic/controller/TaCustomerStatisticMonthlyController.java → src/main/java/com/huiju/estateagents/statistic/controller/TsCustomerStatisticMonthlyController.java View File

@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
5 5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6 6
 import com.huiju.estateagents.base.BaseController;
7 7
 import com.huiju.estateagents.base.ResponseBean;
8
-import com.huiju.estateagents.statistic.entity.TaCustomerStatisticMonthly;
9
-import com.huiju.estateagents.statistic.service.ITaCustomerStatisticMonthlyService;
8
+import com.huiju.estateagents.statistic.entity.TsCustomerStatisticMonthly;
9
+import com.huiju.estateagents.statistic.service.ITsCustomerStatisticMonthlyService;
10 10
 import org.slf4j.Logger;
11 11
 import org.slf4j.LoggerFactory;
12 12
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,12 +31,12 @@ import java.util.List;
31 31
  */
32 32
 @RestController
33 33
 @RequestMapping("/api")
34
-public class TaCustomerStatisticMonthlyController extends BaseController {
34
+public class TsCustomerStatisticMonthlyController extends BaseController {
35 35
 
36
-    private final Logger logger = LoggerFactory.getLogger(TaCustomerStatisticMonthlyController.class);
36
+    private final Logger logger = LoggerFactory.getLogger(TsCustomerStatisticMonthlyController.class);
37 37
 
38 38
     @Autowired
39
-    public ITaCustomerStatisticMonthlyService iTaCustomerStatisticMonthlyService;
39
+    public ITsCustomerStatisticMonthlyService iTaCustomerStatisticMonthlyService;
40 40
 
41 41
 
42 42
     /**
@@ -51,11 +51,11 @@ public class TaCustomerStatisticMonthlyController extends BaseController {
51 51
         ResponseBean responseBean = new ResponseBean();
52 52
         try {
53 53
             //使用分页插件
54
-		    IPage<TaCustomerStatisticMonthly> pg = new Page<>(pageNum, pageSize);
55
-            QueryWrapper<TaCustomerStatisticMonthly> queryWrapper = new QueryWrapper<>();
54
+		    IPage<TsCustomerStatisticMonthly> pg = new Page<>(pageNum, pageSize);
55
+            QueryWrapper<TsCustomerStatisticMonthly> queryWrapper = new QueryWrapper<>();
56 56
             queryWrapper.orderByDesc("create_date");
57 57
 
58
-            IPage<TaCustomerStatisticMonthly> result = iTaCustomerStatisticMonthlyService.page(pg, queryWrapper);
58
+            IPage<TsCustomerStatisticMonthly> result = iTaCustomerStatisticMonthlyService.page(pg, queryWrapper);
59 59
             responseBean.addSuccess(result);
60 60
         }catch (Exception e){
61 61
             e.printStackTrace();
@@ -71,7 +71,7 @@ public class TaCustomerStatisticMonthlyController extends BaseController {
71 71
      * @return
72 72
      */
73 73
     @RequestMapping(value="/taCustomerStatisticMonthly",method= RequestMethod.POST)
74
-    public ResponseBean taCustomerStatisticMonthlyAdd(@RequestBody TaCustomerStatisticMonthly taCustomerStatisticMonthly){
74
+    public ResponseBean taCustomerStatisticMonthlyAdd(@RequestBody TsCustomerStatisticMonthly taCustomerStatisticMonthly){
75 75
         ResponseBean responseBean = new ResponseBean();
76 76
         try {
77 77
             if (iTaCustomerStatisticMonthlyService.save(taCustomerStatisticMonthly)){
@@ -117,7 +117,7 @@ public class TaCustomerStatisticMonthlyController extends BaseController {
117 117
      */
118 118
     @RequestMapping(value="/taCustomerStatisticMonthly/{id}",method= RequestMethod.PUT)
119 119
     public ResponseBean taCustomerStatisticMonthlyUpdate(@PathVariable Integer id,
120
-                                        @RequestBody TaCustomerStatisticMonthly taCustomerStatisticMonthly){
120
+                                        @RequestBody TsCustomerStatisticMonthly taCustomerStatisticMonthly){
121 121
         ResponseBean responseBean = new ResponseBean();
122 122
         try {
123 123
             if (iTaCustomerStatisticMonthlyService.updateById(taCustomerStatisticMonthly)){
@@ -161,7 +161,7 @@ public class TaCustomerStatisticMonthlyController extends BaseController {
161 161
         ResponseBean responseBean = new ResponseBean();
162 162
         try {
163 163
             //查询月客户分析数据
164
-            List<TaCustomerStatisticMonthly> result = iTaCustomerStatisticMonthlyService.getCustomerMonthlyList(customerType, getOrgId(request));
164
+            List<TsCustomerStatisticMonthly> result = iTaCustomerStatisticMonthlyService.getCustomerMonthlyList(customerType, getOrgId(request));
165 165
             responseBean.addSuccess(result);
166 166
         }catch (Exception e){
167 167
             e.printStackTrace();

src/main/java/com/huiju/estateagents/statistic/entity/TaCustomerGenderStatistic.java → src/main/java/com/huiju/estateagents/statistic/entity/TsCustomerGenderStatistic.java View File

@@ -21,7 +21,7 @@ import java.time.LocalDateTime;
21 21
 @Data
22 22
 @EqualsAndHashCode(callSuper = false)
23 23
 @Accessors(chain = true)
24
-public class TaCustomerGenderStatistic implements Serializable {
24
+public class TsCustomerGenderStatistic implements Serializable {
25 25
 
26 26
     private static final long serialVersionUID = 1L;
27 27
 

src/main/java/com/huiju/estateagents/statistic/entity/TaCustomerStatisticDaily.java → src/main/java/com/huiju/estateagents/statistic/entity/TsCustomerStatisticDaily.java View File

@@ -22,7 +22,7 @@ import java.time.LocalDateTime;
22 22
 @EqualsAndHashCode(callSuper = false)
23 23
 @Accessors(chain = true)
24 24
 @TableName("ta_customer_statistic_daily")
25
-public class TaCustomerStatisticDaily implements Serializable {
25
+public class TsCustomerStatisticDaily implements Serializable {
26 26
 
27 27
     private static final long serialVersionUID = 1L;
28 28
 
@@ -51,6 +51,11 @@ public class TaCustomerStatisticDaily implements Serializable {
51 51
      * 创建时间
52 52
      */
53 53
     private LocalDateTime createDate;
54
+    
55
+    /**
56
+     * 日期 格式yyyymmdd例20191111
57
+     */
58
+    private String day;
54 59
 
55 60
 
56 61
 }

src/main/java/com/huiju/estateagents/statistic/entity/TaCustomerStatisticMonthly.java → src/main/java/com/huiju/estateagents/statistic/entity/TsCustomerStatisticMonthly.java View File

@@ -22,7 +22,7 @@ import java.time.LocalDateTime;
22 22
 @EqualsAndHashCode(callSuper = false)
23 23
 @Accessors(chain = true)
24 24
 @TableName("ta_customer_statistic_monthly")
25
-public class TaCustomerStatisticMonthly implements Serializable {
25
+public class TsCustomerStatisticMonthly implements Serializable {
26 26
 
27 27
     private static final long serialVersionUID = 1L;
28 28
 

src/main/java/com/huiju/estateagents/statistic/mapper/TaCustomerGenderStatisticMapper.java → src/main/java/com/huiju/estateagents/statistic/mapper/TsCustomerGenderStatisticMapper.java View File

@@ -2,11 +2,10 @@ package com.huiju.estateagents.statistic.mapper;
2 2
 
3 3
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4 4
 import com.huiju.estateagents.statistic.entity.GenderStatistic;
5
-import com.huiju.estateagents.statistic.entity.TaCustomerGenderStatistic;
5
+import com.huiju.estateagents.statistic.entity.TsCustomerGenderStatistic;
6 6
 import org.apache.ibatis.annotations.Mapper;
7 7
 
8 8
 import java.util.List;
9
-import java.util.Map;
10 9
 
11 10
 /**
12 11
  * <p>
@@ -17,7 +16,7 @@ import java.util.Map;
17 16
  * @since 2019-11-08
18 17
  */
19 18
 @Mapper
20
-public interface TaCustomerGenderStatisticMapper extends BaseMapper<TaCustomerGenderStatistic> {
19
+public interface TsCustomerGenderStatisticMapper extends BaseMapper<TsCustomerGenderStatistic> {
21 20
 	
22 21
 	/**
23 22
 	 * 获取新增客户的男女性别比

src/main/java/com/huiju/estateagents/statistic/mapper/TaCustomerStatisticDailyMapper.java → src/main/java/com/huiju/estateagents/statistic/mapper/TsCustomerStatisticDailyMapper.java View File

@@ -1,13 +1,12 @@
1 1
 package com.huiju.estateagents.statistic.mapper;
2 2
 
3 3
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
-import com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily;
4
+import com.huiju.estateagents.statistic.entity.TsCustomerStatisticDaily;
5 5
 import org.apache.ibatis.annotations.Mapper;
6 6
 import org.apache.ibatis.annotations.Param;
7 7
 
8 8
 import java.time.LocalDateTime;
9 9
 import java.util.List;
10
-import java.util.Map;
11 10
 
12 11
 /**
13 12
  * <p>
@@ -18,14 +17,14 @@ import java.util.Map;
18 17
  * @since 2019-11-08
19 18
  */
20 19
 @Mapper
21
-public interface TaCustomerStatisticDailyMapper extends BaseMapper<TaCustomerStatisticDaily> {
20
+public interface TsCustomerStatisticDailyMapper extends BaseMapper<TsCustomerStatisticDaily> {
22 21
 	
23 22
 	/**
24 23
 	 * 获取当天跟进客户数
25 24
 	 * @param nowDate
26 25
 	 * @return
27 26
 	 */
28
-	List<TaCustomerStatisticDaily> getFollowUpData(@Param("nowDate") LocalDateTime nowDate);
27
+	List<TsCustomerStatisticDaily> getFollowUpData(@Param("nowDate") LocalDateTime nowDate);
29 28
 	
30 29
 	/**
31 30
 	 * 获取当天新增客户数
@@ -33,7 +32,7 @@ public interface TaCustomerStatisticDailyMapper extends BaseMapper<TaCustomerSta
33 32
 	 * @param status
34 33
 	 * @return
35 34
 	 */
36
-	List<TaCustomerStatisticDaily> getNewCustomerData(@Param("nowDate") LocalDateTime nowDate,@Param("status") int status);
35
+	List<TsCustomerStatisticDaily> getNewCustomerData(@Param("nowDate") LocalDateTime nowDate, @Param("status") int status);
37 36
 	
38 37
 	/**
39 38
 	 * 获取当天到访客户数
@@ -41,7 +40,7 @@ public interface TaCustomerStatisticDailyMapper extends BaseMapper<TaCustomerSta
41 40
 	 * @param checkin
42 41
 	 * @return
43 42
 	 */
44
-	List<TaCustomerStatisticDaily> getVisiteCustomerData(@Param("nowDate") LocalDateTime nowDate,@Param("checkin") int checkin);
43
+	List<TsCustomerStatisticDaily> getVisiteCustomerData(@Param("nowDate") LocalDateTime nowDate, @Param("checkin") int checkin);
45 44
 	
46 45
 	/**
47 46
 	 * 获取31天的统计数据
@@ -51,7 +50,7 @@ public interface TaCustomerStatisticDailyMapper extends BaseMapper<TaCustomerSta
51 50
 	 * @param beforeDate
52 51
 	 * @return
53 52
 	 */
54
-	List<TaCustomerStatisticDaily> getDailyList(@Param("customerType") String customerType,@Param("orgId")  Integer orgId,@Param("nowDate")  LocalDateTime nowDate,@Param("beforeDate")  LocalDateTime beforeDate);
53
+	List<TsCustomerStatisticDaily> getDailyList(@Param("customerType") String customerType, @Param("orgId")  Integer orgId, @Param("nowDate")  LocalDateTime nowDate, @Param("beforeDate")  LocalDateTime beforeDate);
55 54
 	
56 55
 	int deleteNowDate(@Param("nowDate") LocalDateTime nowDate,@Param("customerType") String customerType);
57 56
 }

src/main/java/com/huiju/estateagents/statistic/mapper/TaCustomerStatisticMonthlyMapper.java → src/main/java/com/huiju/estateagents/statistic/mapper/TsCustomerStatisticMonthlyMapper.java View File

@@ -1,7 +1,7 @@
1 1
 package com.huiju.estateagents.statistic.mapper;
2 2
 
3 3
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
-import com.huiju.estateagents.statistic.entity.TaCustomerStatisticMonthly;
4
+import com.huiju.estateagents.statistic.entity.TsCustomerStatisticMonthly;
5 5
 import org.apache.ibatis.annotations.Mapper;
6 6
 import org.apache.ibatis.annotations.Param;
7 7
 
@@ -17,7 +17,7 @@ import java.util.List;
17 17
  * @since 2019-11-08
18 18
  */
19 19
 @Mapper
20
-public interface TaCustomerStatisticMonthlyMapper extends BaseMapper<TaCustomerStatisticMonthly> {
20
+public interface TsCustomerStatisticMonthlyMapper extends BaseMapper<TsCustomerStatisticMonthly> {
21 21
 	
22 22
 	/**
23 23
 	 * 获取一个月新增客户的数据插入
@@ -25,14 +25,14 @@ public interface TaCustomerStatisticMonthlyMapper extends BaseMapper<TaCustomerS
25 25
 	 * @param status
26 26
 	 * @return
27 27
 	 */
28
-	List<TaCustomerStatisticMonthly> getNewCustomerStatisticMonthly(@Param("nowDate") LocalDateTime nowDate,@Param("status") int status);
28
+	List<TsCustomerStatisticMonthly> getNewCustomerStatisticMonthly(@Param("nowDate") LocalDateTime nowDate, @Param("status") int status);
29 29
 	
30 30
 	/**
31 31
 	 * 获取一个月跟进客户数据插入
32 32
 	 * @param nowDate
33 33
 	 * @return
34 34
 	 */
35
-	List<TaCustomerStatisticMonthly> getFollowUpStatisticMonthly(@Param("nowDate") LocalDateTime nowDate);
35
+	List<TsCustomerStatisticMonthly> getFollowUpStatisticMonthly(@Param("nowDate") LocalDateTime nowDate);
36 36
 	
37 37
 	/**
38 38
 	 * 获取一个月访问客户数据插入
@@ -40,7 +40,7 @@ public interface TaCustomerStatisticMonthlyMapper extends BaseMapper<TaCustomerS
40 40
 	 * @param checkin
41 41
 	 * @return
42 42
 	 */
43
-	List<TaCustomerStatisticMonthly> getVisiteStatisticMonthly(@Param("nowDate") LocalDateTime nowDate,@Param("checkin") int checkin);
43
+	List<TsCustomerStatisticMonthly> getVisiteStatisticMonthly(@Param("nowDate") LocalDateTime nowDate, @Param("checkin") int checkin);
44 44
 	
45 45
 	/**
46 46
 	 * 获取12个月的统计数据
@@ -50,5 +50,5 @@ public interface TaCustomerStatisticMonthlyMapper extends BaseMapper<TaCustomerS
50 50
 	 * @param beforeDate
51 51
 	 * @return
52 52
 	 */
53
-	List<TaCustomerStatisticMonthly> getMonthlyList(@Param("customerType") String customerType,@Param("orgId") Integer orgId,@Param("nowDate") LocalDateTime nowDate,@Param("beforeDate") LocalDateTime beforeDate);
53
+	List<TsCustomerStatisticMonthly> getMonthlyList(@Param("customerType") String customerType, @Param("orgId") Integer orgId, @Param("nowDate") LocalDateTime nowDate, @Param("beforeDate") LocalDateTime beforeDate);
54 54
 }

src/main/java/com/huiju/estateagents/statistic/service/ITaCustomerGenderStatisticService.java → src/main/java/com/huiju/estateagents/statistic/service/ITsCustomerGenderStatisticService.java View File

@@ -1,7 +1,7 @@
1 1
 package com.huiju.estateagents.statistic.service;
2 2
 
3 3
 import com.baomidou.mybatisplus.extension.service.IService;
4
-import com.huiju.estateagents.statistic.entity.TaCustomerGenderStatistic;
4
+import com.huiju.estateagents.statistic.entity.TsCustomerGenderStatistic;
5 5
 
6 6
 import java.time.LocalDateTime;
7 7
 
@@ -13,7 +13,7 @@ import java.time.LocalDateTime;
13 13
  * @author jobob
14 14
  * @since 2019-11-08
15 15
  */
16
-public interface ITaCustomerGenderStatisticService extends IService<TaCustomerGenderStatistic> {
16
+public interface ITsCustomerGenderStatisticService extends IService<TsCustomerGenderStatistic> {
17 17
 	
18 18
 	/**
19 19
 	 * 每天的新增客户性别统计

src/main/java/com/huiju/estateagents/statistic/service/ITaCustomerStatisticDailyService.java → src/main/java/com/huiju/estateagents/statistic/service/ITsCustomerStatisticDailyService.java View File

@@ -1,7 +1,7 @@
1 1
 package com.huiju.estateagents.statistic.service;
2 2
 
3 3
 import com.baomidou.mybatisplus.extension.service.IService;
4
-import com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily;
4
+import com.huiju.estateagents.statistic.entity.TsCustomerStatisticDaily;
5 5
 
6 6
 import java.time.LocalDateTime;
7 7
 import java.util.List;
@@ -14,7 +14,7 @@ import java.util.List;
14 14
  * @author jobob
15 15
  * @since 2019-11-08
16 16
  */
17
-public interface ITaCustomerStatisticDailyService extends IService<TaCustomerStatisticDaily> {
17
+public interface ITsCustomerStatisticDailyService extends IService<TsCustomerStatisticDaily> {
18 18
 	
19 19
 	/**
20 20
 	 * 每天的跟进客户统计
@@ -40,5 +40,5 @@ public interface ITaCustomerStatisticDailyService extends IService<TaCustomerSta
40 40
 	 * @param orgId
41 41
 	 * @return
42 42
 	 */
43
-	List<TaCustomerStatisticDaily> getDailyList(String customerType, Integer orgId);
43
+	List<TsCustomerStatisticDaily> getDailyList(String customerType, Integer orgId);
44 44
 }

src/main/java/com/huiju/estateagents/statistic/service/ITaCustomerStatisticMonthlyService.java → src/main/java/com/huiju/estateagents/statistic/service/ITsCustomerStatisticMonthlyService.java View File

@@ -1,7 +1,7 @@
1 1
 package com.huiju.estateagents.statistic.service;
2 2
 
3 3
 import com.baomidou.mybatisplus.extension.service.IService;
4
-import com.huiju.estateagents.statistic.entity.TaCustomerStatisticMonthly;
4
+import com.huiju.estateagents.statistic.entity.TsCustomerStatisticMonthly;
5 5
 
6 6
 import java.time.LocalDateTime;
7 7
 import java.util.List;
@@ -14,7 +14,7 @@ import java.util.List;
14 14
  * @author jobob
15 15
  * @since 2019-11-08
16 16
  */
17
-public interface ITaCustomerStatisticMonthlyService extends IService<TaCustomerStatisticMonthly> {
17
+public interface ITsCustomerStatisticMonthlyService extends IService<TsCustomerStatisticMonthly> {
18 18
 	
19 19
 	/**
20 20
 	 * 每月新增客户统计,每天都更新
@@ -40,5 +40,5 @@ public interface ITaCustomerStatisticMonthlyService extends IService<TaCustomerS
40 40
 	 * @param orgId
41 41
 	 * @return
42 42
 	 */
43
-	List<TaCustomerStatisticMonthly> getCustomerMonthlyList(String customerType, Integer orgId);
43
+	List<TsCustomerStatisticMonthly> getCustomerMonthlyList(String customerType, Integer orgId);
44 44
 }

src/main/java/com/huiju/estateagents/statistic/service/impl/TaCustomerGenderStatisticServiceImpl.java → src/main/java/com/huiju/estateagents/statistic/service/impl/TsCustomerGenderStatisticServiceImpl.java View File

@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4 4
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5 5
 import com.huiju.estateagents.common.CommConstant;
6 6
 import com.huiju.estateagents.statistic.entity.GenderStatistic;
7
-import com.huiju.estateagents.statistic.entity.TaCustomerGenderStatistic;
8
-import com.huiju.estateagents.statistic.mapper.TaCustomerGenderStatisticMapper;
9
-import com.huiju.estateagents.statistic.service.ITaCustomerGenderStatisticService;
7
+import com.huiju.estateagents.statistic.entity.TsCustomerGenderStatistic;
8
+import com.huiju.estateagents.statistic.mapper.TsCustomerGenderStatisticMapper;
9
+import com.huiju.estateagents.statistic.service.ITsCustomerGenderStatisticService;
10 10
 import org.springframework.beans.factory.annotation.Autowired;
11 11
 import org.springframework.stereotype.Service;
12 12
 
@@ -23,10 +23,10 @@ import java.util.List;
23 23
  * @since 2019-11-08
24 24
  */
25 25
 @Service
26
-public class TaCustomerGenderStatisticServiceImpl extends ServiceImpl<TaCustomerGenderStatisticMapper, TaCustomerGenderStatistic> implements ITaCustomerGenderStatisticService {
26
+public class TsCustomerGenderStatisticServiceImpl extends ServiceImpl<TsCustomerGenderStatisticMapper, TsCustomerGenderStatistic> implements ITsCustomerGenderStatisticService {
27 27
 	
28 28
 	@Autowired
29
-	private TaCustomerGenderStatisticMapper customerGenderStatisticMapper;
29
+	private TsCustomerGenderStatisticMapper customerGenderStatisticMapper;
30 30
 	
31 31
 	/**
32 32
 	 * 每天的新增客户性别统计
@@ -80,14 +80,14 @@ public class TaCustomerGenderStatisticServiceImpl extends ServiceImpl<TaCustomer
80 80
 	 */
81 81
 	private void saveBatchCustomerSexData(List<GenderStatistic> customerSexList, LocalDateTime nowDate,String customerType) {
82 82
 		//先删除在添加
83
-		QueryWrapper<TaCustomerGenderStatistic> queryWrapper = new QueryWrapper<>();
83
+		QueryWrapper<TsCustomerGenderStatistic> queryWrapper = new QueryWrapper<>();
84 84
 		queryWrapper.eq("customer_type",customerType);
85 85
 		customerGenderStatisticMapper.delete(queryWrapper);
86 86
 		
87
-		List<TaCustomerGenderStatistic> list = new ArrayList<>();
87
+		List<TsCustomerGenderStatistic> list = new ArrayList<>();
88 88
 		//划分男女未知三条数据
89 89
 		customerSexList.forEach(e -> {
90
-			TaCustomerGenderStatistic maleCustomer = new TaCustomerGenderStatistic();
90
+			TsCustomerGenderStatistic maleCustomer = new TsCustomerGenderStatistic();
91 91
 			maleCustomer.setCreateDate(nowDate);
92 92
 			maleCustomer.setGenderType(CommConstant.SEX_MALE);
93 93
 			maleCustomer.setCustomerType(customerType);
@@ -96,7 +96,7 @@ public class TaCustomerGenderStatisticServiceImpl extends ServiceImpl<TaCustomer
96 96
 			maleCustomer.setOrgId(e.getOrgId());
97 97
 			list.add(maleCustomer);
98 98
 			
99
-			TaCustomerGenderStatistic femaleCustomer = new TaCustomerGenderStatistic();
99
+			TsCustomerGenderStatistic femaleCustomer = new TsCustomerGenderStatistic();
100 100
 			femaleCustomer.setCreateDate(nowDate);
101 101
 			femaleCustomer.setGenderType(CommConstant.SEX_FEMALE);
102 102
 			femaleCustomer.setCustomerType(customerType);
@@ -105,7 +105,7 @@ public class TaCustomerGenderStatisticServiceImpl extends ServiceImpl<TaCustomer
105 105
 			femaleCustomer.setOrgId(e.getOrgId());
106 106
 			list.add(femaleCustomer);
107 107
 			
108
-			TaCustomerGenderStatistic unknownCustomer = new TaCustomerGenderStatistic();
108
+			TsCustomerGenderStatistic unknownCustomer = new TsCustomerGenderStatistic();
109 109
 			unknownCustomer.setCreateDate(nowDate);
110 110
 			unknownCustomer.setGenderType(CommConstant.SEX_UNKNOWN);
111 111
 			unknownCustomer.setCustomerType(customerType);

src/main/java/com/huiju/estateagents/statistic/service/impl/TaCustomerStatisticDailyServiceImpl.java → src/main/java/com/huiju/estateagents/statistic/service/impl/TsCustomerStatisticDailyServiceImpl.java View File

@@ -2,17 +2,16 @@ package com.huiju.estateagents.statistic.service.impl;
2 2
 
3 3
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
4 4
 import com.huiju.estateagents.common.CommConstant;
5
-import com.huiju.estateagents.common.StringUtils;
6
-import com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily;
7
-import com.huiju.estateagents.statistic.mapper.TaCustomerStatisticDailyMapper;
8
-import com.huiju.estateagents.statistic.service.ITaCustomerStatisticDailyService;
5
+import com.huiju.estateagents.statistic.entity.TsCustomerStatisticDaily;
6
+import com.huiju.estateagents.statistic.mapper.TsCustomerStatisticDailyMapper;
7
+import com.huiju.estateagents.statistic.service.ITsCustomerStatisticDailyService;
9 8
 import org.springframework.beans.factory.annotation.Autowired;
10 9
 import org.springframework.stereotype.Service;
11 10
 
12 11
 import java.time.LocalDateTime;
12
+import java.time.format.DateTimeFormatter;
13 13
 import java.util.ArrayList;
14 14
 import java.util.List;
15
-import java.util.Map;
16 15
 
17 16
 /**
18 17
  * <p>
@@ -23,10 +22,10 @@ import java.util.Map;
23 22
  * @since 2019-11-08
24 23
  */
25 24
 @Service
26
-public class TaCustomerStatisticDailyServiceImpl extends ServiceImpl<TaCustomerStatisticDailyMapper, TaCustomerStatisticDaily> implements ITaCustomerStatisticDailyService {
25
+public class TsCustomerStatisticDailyServiceImpl extends ServiceImpl<TsCustomerStatisticDailyMapper, TsCustomerStatisticDaily> implements ITsCustomerStatisticDailyService {
27 26
 	
28 27
 	@Autowired
29
-	private TaCustomerStatisticDailyMapper customerStatisticDailyMapper;
28
+	private TsCustomerStatisticDailyMapper customerStatisticDailyMapper;
30 29
 	
31 30
 	/**
32 31
 	 * 每天的跟进客户统计
@@ -36,7 +35,7 @@ public class TaCustomerStatisticDailyServiceImpl extends ServiceImpl<TaCustomerS
36 35
 	@Override
37 36
 	public void followUpStatisticDaily(LocalDateTime nowDate) {
38 37
 		//按当前时间获取当天的跟进客户的数量,多一个客户进行多次跟进行为,只记录一次
39
-		List<TaCustomerStatisticDaily> list = customerStatisticDailyMapper.getFollowUpData(nowDate);
38
+		List<TsCustomerStatisticDaily> list = customerStatisticDailyMapper.getFollowUpData(nowDate);
40 39
 		//批量保存
41 40
 		statisticDailySaveBatch(list,nowDate,CommConstant.CUSTOMER_TYPE_FOLLOW);
42 41
 	}
@@ -49,7 +48,7 @@ public class TaCustomerStatisticDailyServiceImpl extends ServiceImpl<TaCustomerS
49 48
 	@Override
50 49
 	public void newCustomerStatisticDaily(LocalDateTime nowDate) {
51 50
 		//按当前时间获取当天的新增客户的数量,ta_recommend_customer 表的status 为1 的就是新增客户
52
-		List<TaCustomerStatisticDaily> list = customerStatisticDailyMapper.getNewCustomerData(nowDate,CommConstant.STATUS_NORMAL);
51
+		List<TsCustomerStatisticDaily> list = customerStatisticDailyMapper.getNewCustomerData(nowDate,CommConstant.STATUS_NORMAL);
53 52
 		//批量保存
54 53
 		statisticDailySaveBatch(list,nowDate,CommConstant.CUSTOMER_TYPE_NEW);
55 54
 	}
@@ -62,8 +61,8 @@ public class TaCustomerStatisticDailyServiceImpl extends ServiceImpl<TaCustomerS
62 61
 	@Override
63 62
 	public void visiteStatisticDaily(LocalDateTime nowDate) {
64 63
 		//按当前时间获取当天的到访客户的数量,同一天同一个项目只记录一次
65
-		List<TaCustomerStatisticDaily> list = customerStatisticDailyMapper.getVisiteCustomerData(nowDate,CommConstant.STATUS_NORMAL);
66
-		List<TaCustomerStatisticDaily> saveList = new ArrayList<>();
64
+		List<TsCustomerStatisticDaily> list = customerStatisticDailyMapper.getVisiteCustomerData(nowDate,CommConstant.STATUS_NORMAL);
65
+		List<TsCustomerStatisticDaily> saveList = new ArrayList<>();
67 66
 		list.forEach(e -> {
68 67
 			if (null != e.getOrgId() && !e.getOrgId().equals("null")){
69 68
 				saveList.add(e);
@@ -81,13 +80,13 @@ public class TaCustomerStatisticDailyServiceImpl extends ServiceImpl<TaCustomerS
81 80
 	 * @return
82 81
 	 */
83 82
 	@Override
84
-	public List<TaCustomerStatisticDaily> getDailyList(String customerType, Integer orgId) {
83
+	public List<TsCustomerStatisticDaily> getDailyList(String customerType, Integer orgId) {
85 84
 		//当前日期
86 85
 		LocalDateTime nowDate = LocalDateTime.now();
87 86
 		//31天前的日期
88 87
 		LocalDateTime beforeDate = nowDate.plusDays(-31);
89 88
 		//获取31天的日期数据
90
-		List<TaCustomerStatisticDaily> list = customerStatisticDailyMapper.getDailyList(customerType,orgId,nowDate,beforeDate);
89
+		List<TsCustomerStatisticDaily> list = customerStatisticDailyMapper.getDailyList(customerType,orgId,nowDate,beforeDate);
91 90
 		return list;
92 91
 	}
93 92
 	
@@ -97,13 +96,18 @@ public class TaCustomerStatisticDailyServiceImpl extends ServiceImpl<TaCustomerS
97 96
 	 * @param nowDate
98 97
 	 * @param customerType
99 98
 	 */
100
-	private void statisticDailySaveBatch(List<TaCustomerStatisticDaily> list, LocalDateTime nowDate, String customerType) {
99
+	private void statisticDailySaveBatch(List<TsCustomerStatisticDaily> list, LocalDateTime nowDate, String customerType) {
100
+		//格式化年月日
101
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
102
+		String todayDate = nowDate.format(formatter);
103
+		
101 104
 		//先删除当天数据在添加防止有脏数据
102 105
 		customerStatisticDailyMapper.deleteNowDate(nowDate,customerType);
103 106
 		
104 107
 		list.forEach(e -> {
105 108
 			e.setCreateDate(nowDate);
106 109
 			e.setCustomerType(customerType);
110
+			e.setDay(todayDate);
107 111
 		});
108 112
 		//批量保存
109 113
 		this.saveBatch(list);

src/main/java/com/huiju/estateagents/statistic/service/impl/TaCustomerStatisticMonthlyServiceImpl.java → src/main/java/com/huiju/estateagents/statistic/service/impl/TsCustomerStatisticMonthlyServiceImpl.java View File

@@ -3,10 +3,9 @@ package com.huiju.estateagents.statistic.service.impl;
3 3
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4 4
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5 5
 import com.huiju.estateagents.common.CommConstant;
6
-import com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily;
7
-import com.huiju.estateagents.statistic.entity.TaCustomerStatisticMonthly;
8
-import com.huiju.estateagents.statistic.mapper.TaCustomerStatisticMonthlyMapper;
9
-import com.huiju.estateagents.statistic.service.ITaCustomerStatisticMonthlyService;
6
+import com.huiju.estateagents.statistic.entity.TsCustomerStatisticMonthly;
7
+import com.huiju.estateagents.statistic.mapper.TsCustomerStatisticMonthlyMapper;
8
+import com.huiju.estateagents.statistic.service.ITsCustomerStatisticMonthlyService;
10 9
 import org.springframework.beans.factory.annotation.Autowired;
11 10
 import org.springframework.stereotype.Service;
12 11
 
@@ -24,10 +23,10 @@ import java.util.List;
24 23
  * @since 2019-11-08
25 24
  */
26 25
 @Service
27
-public class TaCustomerStatisticMonthlyServiceImpl extends ServiceImpl<TaCustomerStatisticMonthlyMapper, TaCustomerStatisticMonthly> implements ITaCustomerStatisticMonthlyService {
26
+public class TsCustomerStatisticMonthlyServiceImpl extends ServiceImpl<TsCustomerStatisticMonthlyMapper, TsCustomerStatisticMonthly> implements ITsCustomerStatisticMonthlyService {
28 27
 	
29 28
 	@Autowired
30
-	private TaCustomerStatisticMonthlyMapper customerStatisticMonthlyMapper;
29
+	private TsCustomerStatisticMonthlyMapper customerStatisticMonthlyMapper;
31 30
 	
32 31
 	/**
33 32
 	 * 每月新增客户统计,每天都更新
@@ -37,7 +36,7 @@ public class TaCustomerStatisticMonthlyServiceImpl extends ServiceImpl<TaCustome
37 36
 	@Override
38 37
 	public void newCustomerStatisticMonthly(LocalDateTime nowDate) {
39 38
 		//获取当月新增客户总数
40
-		List<TaCustomerStatisticMonthly> newCustomerMonthList = customerStatisticMonthlyMapper.getNewCustomerStatisticMonthly(nowDate,CommConstant.STATUS_NORMAL);
39
+		List<TsCustomerStatisticMonthly> newCustomerMonthList = customerStatisticMonthlyMapper.getNewCustomerStatisticMonthly(nowDate,CommConstant.STATUS_NORMAL);
41 40
 		//批量插入
42 41
 		statisticMonthlySaveBatch(newCustomerMonthList,nowDate, CommConstant.CUSTOMER_TYPE_NEW);
43 42
 	}
@@ -50,7 +49,7 @@ public class TaCustomerStatisticMonthlyServiceImpl extends ServiceImpl<TaCustome
50 49
 	@Override
51 50
 	public void followUpStatisticMonthly(LocalDateTime nowDate) {
52 51
 		//获取当月跟进客户总数
53
-		List<TaCustomerStatisticMonthly> followUpMonthList = customerStatisticMonthlyMapper.getFollowUpStatisticMonthly(nowDate);
52
+		List<TsCustomerStatisticMonthly> followUpMonthList = customerStatisticMonthlyMapper.getFollowUpStatisticMonthly(nowDate);
54 53
 		statisticMonthlySaveBatch(followUpMonthList,nowDate, CommConstant.CUSTOMER_TYPE_FOLLOW);
55 54
 	}
56 55
 	
@@ -62,8 +61,8 @@ public class TaCustomerStatisticMonthlyServiceImpl extends ServiceImpl<TaCustome
62 61
 	@Override
63 62
 	public void visiteStatisticMonthly(LocalDateTime nowDate) {
64 63
 		//获取当月访问客户总数
65
-		List<TaCustomerStatisticMonthly> visiteMonthList = customerStatisticMonthlyMapper.getVisiteStatisticMonthly(nowDate,CommConstant.STATUS_NORMAL);
66
-		List<TaCustomerStatisticMonthly> newVisiteMonthList = new ArrayList<>();
64
+		List<TsCustomerStatisticMonthly> visiteMonthList = customerStatisticMonthlyMapper.getVisiteStatisticMonthly(nowDate,CommConstant.STATUS_NORMAL);
65
+		List<TsCustomerStatisticMonthly> newVisiteMonthList = new ArrayList<>();
67 66
 		visiteMonthList.forEach(e -> {
68 67
 			if (null != e.getOrgId() && !e.getOrgId().equals("null")){
69 68
 				newVisiteMonthList.add(e);
@@ -80,13 +79,13 @@ public class TaCustomerStatisticMonthlyServiceImpl extends ServiceImpl<TaCustome
80 79
 	 * @return
81 80
 	 */
82 81
 	@Override
83
-	public List<TaCustomerStatisticMonthly> getCustomerMonthlyList(String customerType, Integer orgId) {
82
+	public List<TsCustomerStatisticMonthly> getCustomerMonthlyList(String customerType, Integer orgId) {
84 83
 		//当前日期
85 84
 		LocalDateTime nowDate = LocalDateTime.now();
86 85
 		//12个月前的日期
87 86
 		LocalDateTime beforeDate = nowDate.plusMonths(-12);
88 87
 		//获取31天的日期数据
89
-		List<TaCustomerStatisticMonthly> list = customerStatisticMonthlyMapper.getMonthlyList(customerType,orgId,nowDate,beforeDate);
88
+		List<TsCustomerStatisticMonthly> list = customerStatisticMonthlyMapper.getMonthlyList(customerType,orgId,nowDate,beforeDate);
90 89
 		return list;
91 90
 	}
92 91
 	
@@ -96,13 +95,13 @@ public class TaCustomerStatisticMonthlyServiceImpl extends ServiceImpl<TaCustome
96 95
 	 * @param nowDate
97 96
 	 * @param customerType
98 97
 	 */
99
-	private void statisticMonthlySaveBatch(List<TaCustomerStatisticMonthly> list, LocalDateTime nowDate, String customerType) {
100
-		//格式化年月
98
+	private void statisticMonthlySaveBatch(List<TsCustomerStatisticMonthly> list, LocalDateTime nowDate, String customerType) {
99
+		//格式化年月
101 100
 		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMM");
102 101
 		String todayDate = nowDate.format(formatter);
103 102
 		
104 103
 		//先删除在添加
105
-		QueryWrapper<TaCustomerStatisticMonthly> queryWrapper = new QueryWrapper<>();
104
+		QueryWrapper<TsCustomerStatisticMonthly> queryWrapper = new QueryWrapper<>();
106 105
 		queryWrapper.eq("customer_type",customerType);
107 106
 		queryWrapper.eq("month",todayDate);
108 107
 		customerStatisticMonthlyMapper.delete(queryWrapper);

src/main/resources/mapper/statistic/TaCustomerGenderStatisticMapper.xml → src/main/resources/mapper/statistic/TsCustomerGenderStatisticMapper.xml View File

@@ -1,6 +1,6 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3
-<mapper namespace="com.huiju.estateagents.statistic.mapper.TaCustomerGenderStatisticMapper">
3
+<mapper namespace="com.huiju.estateagents.statistic.mapper.TsCustomerGenderStatisticMapper">
4 4
 
5 5
     <select id="getNewCustomerSexCount" resultType="com.huiju.estateagents.statistic.entity.GenderStatistic">
6 6
         SELECT

src/main/resources/mapper/statistic/TaCustomerStatisticDailyMapper.xml → src/main/resources/mapper/statistic/TsCustomerStatisticDailyMapper.xml View File

@@ -1,6 +1,6 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3
-<mapper namespace="com.huiju.estateagents.statistic.mapper.TaCustomerStatisticDailyMapper">
3
+<mapper namespace="com.huiju.estateagents.statistic.mapper.TsCustomerStatisticDailyMapper">
4 4
 
5 5
     <delete id="deleteNowDate">
6 6
         delete from ta_customer_statistic_daily
@@ -8,7 +8,7 @@
8 8
         AND date_format( create_date, '%Y-%m-%d' ) = date_format( #{nowDate}, '%Y-%m-%d' )
9 9
     </delete>
10 10
 
11
-    <select id="getFollowUpData" resultType="com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily">
11
+    <select id="getFollowUpData" resultType="com.huiju.estateagents.statistic.entity.TsCustomerStatisticDaily">
12 12
         SELECT
13 13
             org_id,
14 14
             count( DISTINCT ( customer_id ) ) as customer_num
@@ -20,7 +20,7 @@
20 20
             org_id
21 21
     </select>
22 22
 
23
-    <select id="getNewCustomerData" resultType="com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily">
23
+    <select id="getNewCustomerData" resultType="com.huiju.estateagents.statistic.entity.TsCustomerStatisticDaily">
24 24
         SELECT
25 25
             org_id,
26 26
             count( customer_id ) as customer_num
@@ -32,7 +32,7 @@
32 32
         GROUP BY
33 33
             org_id
34 34
     </select>
35
-    <select id="getVisiteCustomerData" resultType="com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily">
35
+    <select id="getVisiteCustomerData" resultType="com.huiju.estateagents.statistic.entity.TsCustomerStatisticDaily">
36 36
         SELECT
37 37
             count( DISTINCT ( c.customer_id ) ) as customer_num,
38 38
             c.org_id
@@ -48,7 +48,7 @@
48 48
             c.org_id
49 49
     </select>
50 50
 
51
-    <select id="getDailyList" resultType="com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily">
51
+    <select id="getDailyList" resultType="com.huiju.estateagents.statistic.entity.TsCustomerStatisticDaily">
52 52
         SELECT
53 53
           *
54 54
         FROM

src/main/resources/mapper/statistic/TaCustomerStatisticMonthlyMapper.xml → src/main/resources/mapper/statistic/TsCustomerStatisticMonthlyMapper.xml View File

@@ -1,9 +1,9 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3
-<mapper namespace="com.huiju.estateagents.statistic.mapper.TaCustomerStatisticMonthlyMapper">
3
+<mapper namespace="com.huiju.estateagents.statistic.mapper.TsCustomerStatisticMonthlyMapper">
4 4
 
5 5
     <select id="getNewCustomerStatisticMonthly"
6
-            resultType="com.huiju.estateagents.statistic.entity.TaCustomerStatisticMonthly">
6
+            resultType="com.huiju.estateagents.statistic.entity.TsCustomerStatisticMonthly">
7 7
         SELECT
8 8
             org_id,
9 9
             count( customer_id ) as customer_num
@@ -17,7 +17,7 @@
17 17
     </select>
18 18
 
19 19
     <select id="getFollowUpStatisticMonthly"
20
-            resultType="com.huiju.estateagents.statistic.entity.TaCustomerStatisticMonthly">
20
+            resultType="com.huiju.estateagents.statistic.entity.TsCustomerStatisticMonthly">
21 21
         SELECT
22 22
             org_id,
23 23
             count( DISTINCT ( customer_id ) ) as customer_num
@@ -29,7 +29,7 @@
29 29
             org_id
30 30
     </select>
31 31
     <select id="getVisiteStatisticMonthly"
32
-            resultType="com.huiju.estateagents.statistic.entity.TaCustomerStatisticMonthly">
32
+            resultType="com.huiju.estateagents.statistic.entity.TsCustomerStatisticMonthly">
33 33
         SELECT
34 34
             count( DISTINCT ( c.customer_id ) ) as customer_num,
35 35
             c.org_id
@@ -44,7 +44,7 @@
44 44
         GROUP BY
45 45
             c.org_id
46 46
     </select>
47
-    <select id="getMonthlyList" resultType="com.huiju.estateagents.statistic.entity.TaCustomerStatisticMonthly">
47
+    <select id="getMonthlyList" resultType="com.huiju.estateagents.statistic.entity.TsCustomerStatisticMonthly">
48 48
         SELECT
49 49
           *
50 50
         FROM