zhiyuxing
/
estateagents
Sledovat 0
Oblíbit 0
Rozštěpit 0
Zdrojový kód Úkoly 0 Požadavky na natažení 0 Vydání 15 Wiki Activity
Procházet zdrojové kódy

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

张延森 před 5 roky
rodič
febc99f2c7 dda19682aa
revize
6cb80c4993
9 změnil soubory, kde provedl 1129 přidání a 724 odebrání
Rozdělené zobrazení Ukázat statistiku rozdílových dat
  1. 3
    10
      src/main/java/com/huiju/estateagents/controller/TaBuildingReportController.java
  2. 1
    0
      src/main/java/com/huiju/estateagents/controller/TaSharePersonFromController.java
  3. 2
    0
      src/main/java/com/huiju/estateagents/mapper/TaPersonVisitRecordMapper.java
  4. 3
    0
      src/main/java/com/huiju/estateagents/service/impl/StatisticalServiceImpl.java
  5. 14
    14
      src/main/java/com/huiju/estateagents/statistic/controller/ActivityStatisticController.java
  6. 75
    30
      src/main/java/com/huiju/estateagents/statistic/mapper/TaActicityStaticMapper.java
  7. 29
    28
      src/main/java/com/huiju/estateagents/statistic/service/impl/TaActivityStaticServiceImpl.java
  8. 10
    0
      src/main/resources/mapper/TaPersonVisitRecordMapper.xml
  9. 992
    642
      src/main/resources/mapper/statistic/TaActivityStaticMapper.xml

+ 3
- 10
src/main/java/com/huiju/estateagents/controller/TaBuildingReportController.java Zobrazit soubor 

@@ -1,25 +1,18 @@
1 1 
 package com.huiju.estateagents.controller;
2 2
3 
-import com.alibaba.fastjson.JSON;
4 3 
 import com.alibaba.fastjson.JSONArray;
5 4 
 import com.alibaba.fastjson.JSONObject;
6 5 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
7 6 
 import com.baomidou.mybatisplus.core.metadata.IPage;
8 7 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
8 
+import com.huiju.estateagents.base.BaseController;
9 9 
 import com.huiju.estateagents.base.ResponseBean;
10 10 
 import com.huiju.estateagents.entity.TaBuildingReport;
11 11 
 import com.huiju.estateagents.service.ITaBuildingReportService;
12 12 
 import org.slf4j.Logger;
13 13 
 import org.slf4j.LoggerFactory;
14 14 
 import org.springframework.beans.factory.annotation.Autowired;
15 
-import org.springframework.web.bind.annotation.PathVariable;
16 
-import org.springframework.web.bind.annotation.RequestBody;
17 
-import org.springframework.web.bind.annotation.RequestMapping;
18 
-import org.springframework.web.bind.annotation.RequestMethod;
19 
-import org.springframework.web.bind.annotation.RequestParam;
20 
-import org.springframework.web.bind.annotation.ResponseBody;
21 
-import org.springframework.web.bind.annotation.RestController;
22 
-import com.huiju.estateagents.base.BaseController;
15 
+import org.springframework.web.bind.annotation.*;
23 16
24 17 
 import javax.servlet.http.HttpServletRequest;
25 18 
 import java.time.LocalDateTime;
 
@@ -52,7 +45,7 @@ public class TaBuildingReportController extends BaseController {
52 45 
      */
53 46 
     @RequestMapping(value="/admin/taBuildingReports",method= RequestMethod.GET)
54 47 
     public ResponseBean taBuildingReportList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
55 
-                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
48 
+                                             @RequestParam(value ="pageSize",defaultValue = "20") Integer pageSize,
56 49 
                                              HttpServletRequest request){
57 50 
         ResponseBean responseBean = new ResponseBean();
58 51 
         try {

+ 1
- 0
src/main/java/com/huiju/estateagents/controller/TaSharePersonFromController.java Zobrazit soubor 

@@ -222,6 +222,7 @@ public class TaSharePersonFromController extends BaseController {
222 222 
         try {
223 223 
             QueryWrapper<TdLiveDict> tdLiveDictQueryWrapper = new QueryWrapper<>();
224 224 
             tdLiveDictQueryWrapper.eq("status", 1);
225 
+            tdLiveDictQueryWrapper.orderByDesc("sort");
225 226 
             List<TdLiveDict> tdLiveDictList = tdLiveDictService.list(tdLiveDictQueryWrapper);
226 227 
             responseBean.addSuccess(tdLiveDictList);
227 228 
         }catch (Exception e){

+ 2
- 0
src/main/java/com/huiju/estateagents/mapper/TaPersonVisitRecordMapper.java Zobrazit soubor 

@@ -86,4 +86,6 @@ public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecor
86 86 
     List<TaPersonVisitRecord> selectData();
87 87
88 88 
     List<TaPersonVisitRecord> selectTapersonFromShare();
89 
+
90 
+    Integer selectTodayVisitCount(@Param("orgId") Integer orgId,@Param("nowDate") LocalDateTime now);
89 91 
 }

+ 3
- 0
src/main/java/com/huiju/estateagents/service/impl/StatisticalServiceImpl.java Zobrazit soubor 

@@ -80,10 +80,13 @@ public class StatisticalServiceImpl implements IStatisticalService {
80 80 
         Integer selectRecentlyCount = taPersonMapper.selectTodayRecentlyCount(orgId, LocalDateTime.now());
81 81
82 82 
         // -------  用户来源 end ------------
83 
+        //今日访问次数
84 
+        Integer selectVisitCount = taPersonVisitRecordMapper.selectTodayVisitCount(orgId, LocalDateTime.now());
83 85
84 86 
         map.put("selectUserCount", selectUserCount);
85 87 
         map.put("selectRegisteredCount", selectRegisteredCount);
86 88 
         map.put("selectRecentlyCount", selectRecentlyCount);
89 
+        map.put("selectVisitCount", selectVisitCount);
87 90
88 91 
         responseBean.addSuccess(map);
89 92

+ 14
- 14
src/main/java/com/huiju/estateagents/statistic/controller/ActivityStatisticController.java Zobrazit soubor 

@@ -35,7 +35,7 @@ public class ActivityStatisticController extends BaseController {
35 35 
                                          @RequestParam(value = "buildingId", required = false)String buildingId,
36 36 
                                          @RequestParam(value = "targetType", required = false)String targetType,
37 37 
                                          HttpServletRequest request) {
38 
-        return taActivityStaticService.activityStatistical(startDate, endDate, buildingId, targetType, getOrgId(request));
38 
+        return taActivityStaticService.activityStatistical(startDate, endDate, buildingId, targetType, getOrgId(request), getTaPersonBuildingListByUserId(request), getUserId(request));
39 39 
     }
40 40
41 41 
     /**

@@ -48,7 +48,7 @@ public class ActivityStatisticController extends BaseController {
48 48 
                                             @RequestParam(value = "buildingId", required = false)String buildingId,
49 49 
                                             @RequestParam(value = "targetType", required = false)String targetType,
50 50 
                                             HttpServletRequest request) {
51 
-        return taActivityStaticService.selectAllActivityUser(getOrgId(request), startDate, endDate, buildingId, targetType);
51 
+        return taActivityStaticService.selectAllActivityUser(getOrgId(request), startDate, endDate, buildingId, targetType, getTaPersonBuildingListByUserId(request), getUserId(request));
52 52 
     }
53 53
54 54 
     /**

@@ -64,7 +64,7 @@ public class ActivityStatisticController extends BaseController {
64 64 
                                             @RequestParam(value = "sort", required = false)String sort,
65 65 
                                             @RequestParam(value = "colKey", required = false)String colKey,
66 66 
                                             HttpServletRequest request) {
67 
-        return taActivityStaticService.selectTableData(pageNum, pageSize, getOrgId(request), startDate, endDate, buildingId, targetType, sort, colKey);
67 
+        return taActivityStaticService.selectTableData(pageNum, pageSize, getOrgId(request), startDate, endDate, buildingId, targetType, sort, colKey, getTaPersonBuildingListByUserId(request), getUserId(request));
68 68 
     }
69 69
70 70 
     /**

@@ -72,7 +72,7 @@ public class ActivityStatisticController extends BaseController {
72 72 
      * @return
73 73 
      */
74 74 
     @GetMapping(value = "/admin/activityStatistical/tableDataExport")
75 
-    public void selectTableData(@RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
75 
+    public void selectTableDataExport(@RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
76 76 
                                         @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
77 77 
                                         @RequestParam(value = "buildingId", required = false)String buildingId,
78 78 
                                         @RequestParam(value = "targetType", required = false)String targetType,

@@ -85,7 +85,7 @@ public class ActivityStatisticController extends BaseController {
85 85 
         ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), StatisicAttractUser.class).registerWriteHandler(new CustomCellWriteHandler()).build();
86 86 
         // 设置 sheet, 同一个sheet只需要设置一次
87 87 
         WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
88 
-        List<StatisicAttractUser> data = taActivityStaticService.selectExportTableData(getOrgId(request), startDate, endDate, buildingId, targetType, sort, colKey);
88 
+        List<StatisicAttractUser> data = taActivityStaticService.selectExportTableData(getOrgId(request), startDate, endDate, buildingId, targetType, sort, colKey, getTaPersonBuildingListByUserId(request), getUserId(request));
89 89 
         excelWriter.write(data, writeSheet);
90 90 
         // finish 会帮忙关闭流
91 91 
         excelWriter.finish();

@@ -105,7 +105,7 @@ public class ActivityStatisticController extends BaseController {
105 105 
                                         @RequestParam(value = "sort", required = false)String sort,
106 106 
                                         @RequestParam(value = "colKey", required = false)String colKey,
107 107 
                                         HttpServletRequest request) {
108 
-        return taActivityStaticService.selectActivityStatisDetail(pageNum, pageSize, getOrgId(request), startDate, endDate, buildingId, targetType, activityName, sort, colKey);
108 
+        return taActivityStaticService.selectActivityStatisDetail(pageNum, pageSize, getOrgId(request), startDate, endDate, buildingId, targetType, activityName, sort, colKey, getTaPersonBuildingListByUserId(request), getUserId(request));
109 109 
     }
110 110
111 111 
     /**

@@ -127,7 +127,7 @@ public class ActivityStatisticController extends BaseController {
127 127 
         ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ActivityDetailShareRecord.class).registerWriteHandler(new CustomCellWriteHandler()).build();
128 128 
         // 设置 sheet, 同一个sheet只需要设置一次
129 129 
         WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
130 
-        List<ActivityDetailShareRecord> data = taActivityStaticService.selectActivityStatisDetailExport(getOrgId(request), startDate, endDate, buildingId, targetType, activityName, sort, colKey);
130 
+        List<ActivityDetailShareRecord> data = taActivityStaticService.selectActivityStatisDetailExport(getOrgId(request), startDate, endDate, buildingId, targetType, activityName, sort, colKey, getTaPersonBuildingListByUserId(request), getUserId(request));
131 131 
         excelWriter.write(data, writeSheet);
132 132 
         // finish 会帮忙关闭流
133 133 
         excelWriter.finish();

@@ -150,7 +150,7 @@ public class ActivityStatisticController extends BaseController {
150 150 
                                                    @RequestParam(value = "colKey", required = false)String colKey,
151 151 
                                                    @RequestParam(value = "buildingId", required = false)String buildingId,
152 152 
                                                    HttpServletRequest request) {
153 
-        return taActivityStaticService.selectActivitySharePersonNum(pageNum, pageSize, getOrgId(request), startDate, endDate, sharePersonType, sharePersonName, sharePhone, activityId, activityType, buildingId, sort, colKey);
153 
+        return taActivityStaticService.selectActivitySharePersonNum(pageNum, pageSize, getOrgId(request), startDate, endDate, sharePersonType, sharePersonName, sharePhone, activityId, activityType, buildingId, sort, colKey, getTaPersonBuildingListByUserId(request), getUserId(request));
154 154 
     }
155 155
156 156 
     /**

@@ -176,7 +176,7 @@ public class ActivityStatisticController extends BaseController {
176 176 
         ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), SharePersonNum.class).registerWriteHandler(new CustomCellWriteHandler()).build();
177 177 
         // 设置 sheet, 同一个sheet只需要设置一次
178 178 
         WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
179 
-        List<SharePersonNum> data = taActivityStaticService.selectActivitySharePersonNumExport(getOrgId(request), startDate, endDate, sharePersonType, sharePersonName, sharePhone, activityId, activityType, buildingId, sort, colKey);
179 
+        List<SharePersonNum> data = taActivityStaticService.selectActivitySharePersonNumExport(getOrgId(request), startDate, endDate, sharePersonType, sharePersonName, sharePhone, activityId, activityType, buildingId, sort, colKey, getTaPersonBuildingListByUserId(request), getUserId(request));
180 180 
         excelWriter.write(data, writeSheet);
181 181 
         // finish 会帮忙关闭流
182 182 
         excelWriter.finish();

@@ -192,7 +192,7 @@ public class ActivityStatisticController extends BaseController {
192 192 
                                                      @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
193 193 
                                                      @RequestParam(value = "sharePersonType", required = false)String sharePersonType,
194 194 
                                                      @RequestParam(value = "sharePersonName", required = false)  String sharePersonName,
195 
-                                                     @RequestParam(value = "sharePhone", required = false)String sharePhone,
195 
+                                                     @RequestParam(value = "sharePersonPhone", required = false)String sharePersonPhone,
196 196 
                                                      @RequestParam(value = "activityId", required = false)String activityId,
197 197 
                                                      @RequestParam(value = "activityType", required = false)String activityType,
198 198 
                                                      @RequestParam(value = "personId", required = false)String personId,

@@ -200,7 +200,7 @@ public class ActivityStatisticController extends BaseController {
200 200 
                                                      @RequestParam(value = "sort", required = false)String sort,
201 201 
                                                      @RequestParam(value = "colKey", required = false)String colKey,
202 202 
                                                      HttpServletRequest request) {
203 
-        return taActivityStaticService.selectActivityShareNum(pageNum, pageSize, getOrgId(request), startDate, endDate, sharePersonType, sharePersonName, sharePhone, activityId, activityType, personId, buildingId, sort, colKey);
203 
+        return taActivityStaticService.selectActivityShareNum(pageNum, pageSize, getOrgId(request), startDate, endDate, sharePersonType, sharePersonName, sharePersonPhone, activityId, activityType, personId, buildingId, sort, colKey, getTaPersonBuildingListByUserId(request), getUserId(request));
204 204 
     }
205 205
206 206 
     /**

@@ -226,7 +226,7 @@ public class ActivityStatisticController extends BaseController {
226 226 
         ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ShareNum.class).registerWriteHandler(new CustomCellWriteHandler()).build();
227 227 
         // 设置 sheet, 同一个sheet只需要设置一次
228 228 
         WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
229 
-        List<ShareNum> data = taActivityStaticService.selectActivityShareNumExport(getOrgId(request), startDate, endDate, sharePersonType, sharePersonName, sharePhone, activityId, activityType, personId, buildingId, sort, colKey);
229 
+        List<ShareNum> data = taActivityStaticService.selectActivityShareNumExport(getOrgId(request), startDate, endDate, sharePersonType, sharePersonName, sharePhone, activityId, activityType, personId, buildingId, sort, colKey, getTaPersonBuildingListByUserId(request), getUserId(request));
230 230 
         excelWriter.write(data, writeSheet);
231 231 
         // finish 会帮忙关闭流
232 232 
         excelWriter.finish();

@@ -245,7 +245,7 @@ public class ActivityStatisticController extends BaseController {
245 245 
                                                @RequestParam(value = "activityType", required = false)String activityType,
246 246 
                                                @RequestParam(value = "buildingId", required = false)String buildingId,
247 247 
                                                HttpServletRequest request) {
248 
-        return taActivityStaticService.selectActivityAddRegistNum(pageNum, pageSize, getOrgId(request), startDate, endDate, personFrom, activityId, activityType, buildingId);
248 
+        return taActivityStaticService.selectActivityAddRegistNum(pageNum, pageSize, getOrgId(request), startDate, endDate, personFrom, activityId, activityType, buildingId, getTaPersonBuildingListByUserId(request), getUserId(request));
249 249 
     }
250 250
251 251 
     /**

@@ -266,7 +266,7 @@ public class ActivityStatisticController extends BaseController {
266 266 
         ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), AddRegistNum.class).registerWriteHandler(new CustomCellWriteHandler()).build();
267 267 
         // 设置 sheet, 同一个sheet只需要设置一次
268 268 
         WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
269 
-        List<AddRegistNum> data = taActivityStaticService.selectActivityAddRegistNumExport(getOrgId(request), startDate, endDate, personFrom, activityId, activityType, buildingId);
269 
+        List<AddRegistNum> data = taActivityStaticService.selectActivityAddRegistNumExport(getOrgId(request), startDate, endDate, personFrom, activityId, activityType, buildingId, getTaPersonBuildingListByUserId(request), getUserId(request));
270 270 
         excelWriter.write(data, writeSheet);
271 271 
         // finish 会帮忙关闭流
272 272 
         excelWriter.finish();

+ 75
- 30
src/main/java/com/huiju/estateagents/statistic/mapper/TaActicityStaticMapper.java Zobrazit soubor 

@@ -1,6 +1,7 @@
1 1 
 package com.huiju.estateagents.statistic.mapper;
2 2
3 3 
 import com.baomidou.mybatisplus.core.metadata.IPage;
4 
+import com.huiju.estateagents.entity.TaPersonBuilding;
4 5 
 import com.huiju.estateagents.excel.ActivityStatistics.*;
5 6 
 import org.apache.ibatis.annotations.Mapper;
6 7 
 import org.apache.ibatis.annotations.Param;

@@ -12,17 +13,55 @@ import java.util.Map;
12 13
13 14 
 @Mapper
14 15 
 public interface TaActicityStaticMapper {
15 
-    Integer selectSharePersonNum(@Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate, @Param("buildingId") String buildingId, @Param("targetType") String targetType, @Param("orgId") Integer orgId);
16 16
17 
-    Integer selectShareNum(@Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate, @Param("buildingId") String buildingId, @Param("targetType") String targetType, @Param("orgId") Integer orgId);
17 
+    Integer selectSharePersonNum(
18 
+            @Param("startDate") LocalDateTime startDate,
19 
+            @Param("endDate") LocalDateTime endDate,
20 
+            @Param("buildingId") String buildingId,
21 
+            @Param("targetType") String targetType,
22 
+            @Param("orgId") Integer orgId,
23 
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
24 
+            @Param("userId") Integer userId);
25 
+
26 
+    Integer selectShareNum(@Param("startDate") LocalDateTime startDate,
27 
+                           @Param("endDate") LocalDateTime endDate,
28 
+                           @Param("buildingId") String buildingId,
29 
+                           @Param("targetType") String targetType,
30 
+                           @Param("orgId") Integer orgId,
31 
+                           @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
32 
+                           @Param("userId") Integer userId);
18 33
19 
-    Integer selectVisitPersonNum(@Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate, @Param("buildingId") String buildingId, @Param("targetType") String targetType, @Param("orgId") Integer orgId);
34 
+    Integer selectVisitPersonNum(@Param("startDate") LocalDateTime startDate,
35 
+                                 @Param("endDate") LocalDateTime endDate,
36 
+                                 @Param("buildingId") String buildingId,
37 
+                                 @Param("targetType") String targetType,
38 
+                                 @Param("orgId") Integer orgId,
39 
+                                 @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
40 
+                                 @Param("userId") Integer userId);
20 41
21 
-    Integer selectVisitNum(@Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate, @Param("buildingId") String buildingId, @Param("targetType") String targetType, @Param("orgId") Integer orgId);
42 
+    Integer selectVisitNum(@Param("startDate") LocalDateTime startDate,
43 
+                           @Param("endDate") LocalDateTime endDate,
44 
+                           @Param("buildingId") String buildingId,
45 
+                           @Param("targetType") String targetType,
46 
+                           @Param("orgId") Integer orgId,
47 
+                           @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
48 
+                           @Param("userId") Integer userId);
22 49
23 
-    List<Map<String, Object>> selectShareCount(@Param("orgId") Integer orgId, @Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate, @Param("buildingId") String buildingId, @Param("targetType") String targetType);
50 
+    List<Map<String, Object>> selectShareCount(@Param("orgId") Integer orgId,
51 
+                                               @Param("startDate") LocalDateTime startDate,
52 
+                                               @Param("endDate") LocalDateTime endDate,
53 
+                                               @Param("buildingId") String buildingId,
54 
+                                               @Param("targetType") String targetType,
55 
+                                               @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
56 
+                                               @Param("userId") Integer userId );
24 57
25 
-    List<Map<String, Object>> selectSharePersonCount(@Param("orgId") Integer orgId, @Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate, @Param("buildingId") String buildingId, @Param("targetType") String targetType);
58 
+    List<Map<String, Object>> selectSharePersonCount(@Param("orgId") Integer orgId,
59 
+                                                     @Param("startDate") LocalDateTime startDate,
60 
+                                                     @Param("endDate") LocalDateTime endDate,
61 
+                                                     @Param("buildingId") String buildingId,
62 
+                                                     @Param("targetType") String targetType,
63 
+                                                     @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
64 
+                                                     @Param("userId") Integer userId);
26 65
27 66 
     List<Map<String, Object>> selectVisitCount(@Param("orgId") Integer orgId, @Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate, @Param("buildingId") String buildingId, @Param("targetType") String targetType);
28 67 
 

@@ -38,7 +77,9 @@ public interface TaActicityStaticMapper {
38 77 
             @Param("buildingId") String buildingId,
39 78 
             @Param("targetType") String targetType,
40 79 
             @Param("sortType") String sortType,
41 
-            @Param("colKey") String colKey );
80 
+            @Param("colKey") String colKey,
81 
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
82 
+            @Param("userId") Integer userId );
42 83
43 84 
     List<StatisicAttractUser> selectExportTableData(
44 85 
             @Param("orgId") Integer orgId,

@@ -47,7 +88,9 @@ public interface TaActicityStaticMapper {
47 88 
             @Param("buildingId") String buildingId,
48 89 
             @Param("targetType") String targetType,
49 90 
             @Param("sortType") String sortType,
50 
-            @Param("colKey") String colKey );
91 
+            @Param("colKey") String colKey,
92 
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
93 
+            @Param("userId") Integer userId );
51 94
52 95 
     IPage<ActivityDetailShareRecord> selectActivityStatisDetail(
53 96 
             IPage<ActivityDetailShareRecord> attractUserIPage,

@@ -58,7 +101,9 @@ public interface TaActicityStaticMapper {
58 101 
             @Param("targetType") String targetType,
59 102 
             @Param("activityName") String activityName,
60 103 
             @Param("sortType") String sortType,
61 
-            @Param("colKey") String colKey
104 
+            @Param("colKey") String colKey,
105 
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
106 
+            @Param("userId") Integer userId
62 107 
     );
63 108
64 109 
     List<ActivityDetailShareRecord> selectActivityStatisDetailExport(

@@ -69,7 +114,9 @@ public interface TaActicityStaticMapper {
69 114 
             @Param("targetType") String targetType,
70 115 
             @Param("activityName") String activityName,
71 116 
             @Param("sortType") String sortType,
72 
-            @Param("colKey") String colKey
117 
+            @Param("colKey") String colKey,
118 
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
119 
+            @Param("userId") Integer userId
73 120 
     );
74 121
75 122 
     IPage<SharePersonNum> selectActivitySharePersonNum(

@@ -84,7 +131,9 @@ public interface TaActicityStaticMapper {
84 131 
             @Param("activityType") String activityType,
85 132 
             @Param("buildingId") String buildingId,
86 133 
             @Param("sort") String sort,
87 
-            @Param("colKey") String colKey
134 
+            @Param("colKey") String colKey,
135 
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
136 
+            @Param("userId") Integer userId
88 137 
     );
89 138
90 139 
     List<SharePersonNum> selectActivitySharePersonNumExport(

@@ -98,7 +147,9 @@ public interface TaActicityStaticMapper {
98 147 
             @Param("activityType") String activityType,
99 148 
             @Param("buildingId") String buildingId,
100 149 
             @Param("sort") String sort,
101 
-            @Param("colKey") String colKey
150 
+            @Param("colKey") String colKey,
151 
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
152 
+            @Param("userId") Integer userId
102 153 
     );
103 154
104 155 
     IPage<ShareNum> selectActivityShareNum(

@@ -114,7 +165,9 @@ public interface TaActicityStaticMapper {
114 165 
             @Param("personId") String personId,
115 166 
             @Param("buildingId") String buildingId,
116 167 
             @Param("sort") String sort,
117 
-            @Param("colKey") String colKey
168 
+            @Param("colKey") String colKey,
169 
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
170 
+            @Param("userId") Integer userId
118 171 
     );
119 172
120 173 
     List<ShareNum> selectActivityShareNumExport(

@@ -129,7 +182,9 @@ public interface TaActicityStaticMapper {
129 182 
             @Param("personId") String personId,
130 183 
             @Param("buildingId") String buildingId,
131 184 
             @Param("sort") String sort,
132 
-            @Param("colKey") String colKey
185 
+            @Param("colKey") String colKey,
186 
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
187 
+            @Param("userId") Integer userId
133 188 
     );
134 189
135 190 
     IPage<AddRegistNum> selectActivityAddRegistNum(

@@ -140,7 +195,9 @@ public interface TaActicityStaticMapper {
140 195 
             @Param("personFrom") String personFrom,
141 196 
             @Param("activityId") String activityId,
142 197 
             @Param("activityType") String activityType,
143 
-            @Param("buildingId") String buildingId
198 
+            @Param("buildingId") String buildingId,
199 
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
200 
+            @Param("userId") Integer userId
144 201 
     );
145 202
146 203 
     List<AddRegistNum> selectActivityAddRegistNumExport(

@@ -150,7 +207,9 @@ public interface TaActicityStaticMapper {
150 207 
             @Param("personFrom") String personFrom,
151 208 
             @Param("activityId") String activityId,
152 209 
             @Param("activityType") String activityType,
153 
-            @Param("buildingId") String buildingId
210 
+            @Param("buildingId") String buildingId,
211 
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
212 
+            @Param("userId") Integer userId
154 213 
     );
155 214
156 215 
     IPage<VisitNum> selectActivityVisitNum(

@@ -207,20 +266,6 @@ public interface TaActicityStaticMapper {
207 266 
             @Param("buildingId") String buildingId
208 267 
     );
209 268
210 
-    List<VisitPersonNum> selectActivityVisitPersonNumByPersonIdExport(
211 
-            @Param("orgId") Integer orgId,
212 
-            @Param("startDate") LocalDateTime startDate,
213 
-            @Param("endDate") LocalDateTime endDate,
214 
-            @Param("personFrom") String personFrom,
215 
-            @Param("province") String province,
216 
-            @Param("realtyConsultant") String realtyConsultant,
217 
-            @Param("realtyConsultantPhone") String realtyConsultantPhone,
218 
-            @Param("activityId") String activityId,
219 
-            @Param("activityType") String activityType,
220 
-            @Param("buildingId") String buildingId,
221 
-            @Param("personId") String personId
222 
-    );
223 
-
224 269 
     IPage<VisitPersonNum> selectActivityVisitPersonNumByPersonId(
225 270 
             IPage<VisitPersonNum> iPage,
226 271 
             @Param("orgId") Integer orgId,

+ 29
- 28
src/main/java/com/huiju/estateagents/statistic/service/impl/TaActivityStaticServiceImpl.java Zobrazit soubor 

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
4 4 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
5 5 
 import com.huiju.estateagents.base.ResponseBean;
6 6 
 import com.huiju.estateagents.common.StringUtils;
7 
+import com.huiju.estateagents.entity.TaPersonBuilding;
7 8 
 import com.huiju.estateagents.excel.ActivityStatistics.*;
8 9 
 import com.huiju.estateagents.statistic.mapper.TaActicityStaticMapper;
9 10 
 import org.springframework.beans.factory.annotation.Autowired;

@@ -22,18 +23,18 @@ public class TaActivityStaticServiceImpl {
22 23 
     @Autowired
23 24 
     private TaActicityStaticMapper taActicityStaticMapper;
24 25
25 
-    public ResponseBean activityStatistical(LocalDate startDate, LocalDate endDate, String building, String targetType, Integer orgId){
26 
+    public ResponseBean activityStatistical(LocalDate startDate, LocalDate endDate, String building, String targetType, Integer orgId, List<TaPersonBuilding> taPersonBuildings, Integer userId){
26 27
27 28 
         ResponseBean responseBean = new ResponseBean();
28 29 
         Map<String, Object> map = new HashMap<>();
29 30
30 
-        Integer sharePersonNum = taActicityStaticMapper.selectSharePersonNum(LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), building, targetType, orgId);
31 
+        Integer sharePersonNum = taActicityStaticMapper.selectSharePersonNum(LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), building, targetType, orgId, taPersonBuildings, userId);
31 32
32 
-        Integer shareNum = taActicityStaticMapper.selectShareNum(LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), building, targetType, orgId);
33 
+        Integer shareNum = taActicityStaticMapper.selectShareNum(LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), building, targetType, orgId, taPersonBuildings, userId);
33 34
34 
-        Integer visitPersonNum = taActicityStaticMapper.selectVisitPersonNum(LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), building, targetType, orgId);
35 
+        Integer visitPersonNum = taActicityStaticMapper.selectVisitPersonNum(LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), building, targetType, orgId, taPersonBuildings, userId);
35 36
36 
-        Integer visitNum = taActicityStaticMapper.selectVisitNum(LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), building, targetType, orgId);
37 
+        Integer visitNum = taActicityStaticMapper.selectVisitNum(LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), building, targetType, orgId, taPersonBuildings, userId);
37 38
38 39 
         map.put("sharePersonNum", sharePersonNum);
39 40 
         map.put("shareNum", shareNum);

@@ -45,12 +46,12 @@ public class TaActivityStaticServiceImpl {
45 46 
         return responseBean;
46 47 
     }
47 48
48 
-    public ResponseBean selectAllActivityUser(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, String targetType){
49 
+    public ResponseBean selectAllActivityUser(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, String targetType, List<TaPersonBuilding> taPersonBuildings, Integer userId){
49 50 
         ResponseBean responseBean = new ResponseBean();
50 51
51 52 
         // 新增用户数
52 
-        List<Map<String, Object>> selectShareCount = taActicityStaticMapper.selectShareCount(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType);
53 
-        List<Map<String, Object>> selectSharePersonCount = taActicityStaticMapper.selectSharePersonCount(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType);
53 
+        List<Map<String, Object>> selectShareCount = taActicityStaticMapper.selectShareCount(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType, taPersonBuildings, userId);
54 
+        List<Map<String, Object>> selectSharePersonCount = taActicityStaticMapper.selectSharePersonCount(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType, taPersonBuildings, userId);
54 55 
         List<Map<String, Object>> selectVisitCount = taActicityStaticMapper.selectVisitCount(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType);
55 56 
         List<Map<String, Object>> selectVisitPersonCount = taActicityStaticMapper.selectVisitPersonCount(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType);
56 57 
         List<Map<String, Object>> selectAddRegistCount = taActicityStaticMapper.selectAddRegistCount(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType);

@@ -90,64 +91,64 @@ public class TaActivityStaticServiceImpl {
90 91 
         return responseBean;
91 92 
     }
92 93
93 
-    public ResponseBean selectTableData(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, String targetType, String sort, String colKey){
94 
+    public ResponseBean selectTableData(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, String targetType, String sort, String colKey, List<TaPersonBuilding> taPersonBuildings, Integer userId){
94 95 
         IPage<StatisicAttractUser> iPage = new Page<>(pageNum, pageSize);
95 96 
         String sortType = "ascend".equals(sort) ? "asc" : "desc";
96 
-        IPage<StatisicAttractUser> data = taActicityStaticMapper.selectTableData(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType, sortType, colKey);
97 
+        IPage<StatisicAttractUser> data = taActicityStaticMapper.selectTableData(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType, sortType, colKey, taPersonBuildings, userId);
97 98 
         return ResponseBean.success(data);
98 99 
     }
99 100
100 
-    public List<StatisicAttractUser> selectExportTableData(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, String targetType, String sort, String colKey){
101 
+    public List<StatisicAttractUser> selectExportTableData(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, String targetType, String sort, String colKey, List<TaPersonBuilding> taPersonBuildings, Integer userId){
101 102 
         String sortType = "ascend".equals(sort) ? "asc" : "desc";
102 
-        return taActicityStaticMapper.selectExportTableData(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType, sortType, colKey);
103 
+        return taActicityStaticMapper.selectExportTableData(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType, sortType, colKey, taPersonBuildings, userId);
103 104 
     }
104 105
105 
-    public ResponseBean selectActivityStatisDetail(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, String targetType, String activityName, String sort, String colKey){
106 
+    public ResponseBean selectActivityStatisDetail(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, String targetType, String activityName, String sort, String colKey, List<TaPersonBuilding> taPersonBuildings, Integer userId){
106 107 
         IPage<ActivityDetailShareRecord> iPage = new Page<>(pageNum, pageSize);
107 108 
         String sortType = "ascend".equals(sort) ? "asc" : "desc";
108 
-        IPage<ActivityDetailShareRecord> data = taActicityStaticMapper.selectActivityStatisDetail(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType, activityName, sortType, colKey);
109 
+        IPage<ActivityDetailShareRecord> data = taActicityStaticMapper.selectActivityStatisDetail(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType, activityName, sortType, colKey, taPersonBuildings, userId);
109 110 
         return ResponseBean.success(data);
110 111 
     }
111 112
112 
-    public List<ActivityDetailShareRecord> selectActivityStatisDetailExport(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, String targetType, String activityName, String sort, String colKey){
113 
+    public List<ActivityDetailShareRecord> selectActivityStatisDetailExport(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, String targetType, String activityName, String sort, String colKey, List<TaPersonBuilding> taPersonBuildings, Integer userId){
113 114 
         String sortType = "ascend".equals(sort) ? "asc" : "desc";
114 
-        return taActicityStaticMapper.selectActivityStatisDetailExport(orgId, startDate, endDate, buildingId, targetType, activityName, sortType, colKey);
115 
+        return taActicityStaticMapper.selectActivityStatisDetailExport(orgId, startDate, endDate, buildingId, targetType, activityName, sortType, colKey, taPersonBuildings, userId);
115 116 
     }
116 117
117 
-    public ResponseBean selectActivitySharePersonNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String sharePersonType, String sharePersonName, String sharePhone, String activityId, String activityType, String buildingId, String sort, String colKey){
118 
+    public ResponseBean selectActivitySharePersonNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String sharePersonType, String sharePersonName, String sharePhone, String activityId, String activityType, String buildingId, String sort, String colKey, List<TaPersonBuilding> taPersonBuildings, Integer userId){
118 119 
         IPage<SharePersonNum> iPage = new Page<>(pageNum, pageSize);
119 120 
         String sortType = "ascend".equals(sort) ? "asc" : "desc";
120 121
121 
-        IPage<SharePersonNum> data = taActicityStaticMapper.selectActivitySharePersonNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), sharePersonType, sharePersonName, sharePhone, activityId, activityType, buildingId, sortType, colKey);
122 
+        IPage<SharePersonNum> data = taActicityStaticMapper.selectActivitySharePersonNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), sharePersonType, sharePersonName, sharePhone, activityId, activityType, buildingId, sortType, colKey, taPersonBuildings, userId);
122 123 
         return ResponseBean.success(data);
123 124 
     }
124 125
125 
-    public List<SharePersonNum> selectActivitySharePersonNumExport(Integer orgId, LocalDate startDate, LocalDate endDate, String sharePersonType, String sharePersonName, String sharePhone, String activityId, String activityType, String buildingId, String sort, String colKey){
126 
+    public List<SharePersonNum> selectActivitySharePersonNumExport(Integer orgId, LocalDate startDate, LocalDate endDate, String sharePersonType, String sharePersonName, String sharePhone, String activityId, String activityType, String buildingId, String sort, String colKey, List<TaPersonBuilding> taPersonBuildings, Integer userId){
126 127 
         String sortType = "ascend".equals(sort) ? "asc" : "desc";
127 
-        return taActicityStaticMapper.selectActivitySharePersonNumExport(orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), sharePersonType, sharePersonName, sharePhone, activityId, activityType, buildingId, sortType, colKey);
128 
+        return taActicityStaticMapper.selectActivitySharePersonNumExport(orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), sharePersonType, sharePersonName, sharePhone, activityId, activityType, buildingId, sortType, colKey, taPersonBuildings, userId);
128 129 
     }
129 130
130 
-    public ResponseBean selectActivityShareNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String sharePersonType, String sharePersonName, String sharePhone, String activityId, String activityType, String personId, String buildingId, String sort, String colKey){
131 
+    public ResponseBean selectActivityShareNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String sharePersonType, String sharePersonName, String sharePhone, String activityId, String activityType, String personId, String buildingId, String sort, String colKey, List<TaPersonBuilding> taPersonBuildings, Integer userId){
131 132 
         IPage<ShareNum> iPage = new Page<>(pageNum, pageSize);
132 133 
         String sortType = "ascend".equals(sort) ? "asc" : "desc";
133 134
134 
-        IPage<ShareNum> data = taActicityStaticMapper.selectActivityShareNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), sharePersonType, sharePersonName, sharePhone, activityId, activityType, personId, buildingId, sortType, colKey);
135 
+        IPage<ShareNum> data = taActicityStaticMapper.selectActivityShareNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), sharePersonType, sharePersonName, sharePhone, activityId, activityType, personId, buildingId, sortType, colKey, taPersonBuildings, userId);
135 136 
         return ResponseBean.success(data);
136 137 
     }
137 138
138 
-    public List<ShareNum> selectActivityShareNumExport(Integer orgId, LocalDate startDate, LocalDate endDate, String sharePersonType, String sharePersonName, String sharePhone, String activityId, String activityType, String personId, String buildingId, String sort, String colKey){
139 
+    public List<ShareNum> selectActivityShareNumExport(Integer orgId, LocalDate startDate, LocalDate endDate, String sharePersonType, String sharePersonName, String sharePhone, String activityId, String activityType, String personId, String buildingId, String sort, String colKey, List<TaPersonBuilding> taPersonBuildings, Integer userId){
139 140 
         String sortType = "ascend".equals(sort) ? "asc" : "desc";
140 
-        return taActicityStaticMapper.selectActivityShareNumExport( orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), sharePersonType, sharePersonName, sharePhone, activityId, activityType, personId, buildingId, sortType, colKey);
141 
+        return taActicityStaticMapper.selectActivityShareNumExport( orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), sharePersonType, sharePersonName, sharePhone, activityId, activityType, personId, buildingId, sortType, colKey, taPersonBuildings, userId);
141 142 
     }
142 143
143 
-    public ResponseBean selectActivityAddRegistNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String activityId, String activityType, String buildingId){
144 
+    public ResponseBean selectActivityAddRegistNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String activityId, String activityType, String buildingId, List<TaPersonBuilding> taPersonBuildings, Integer userId){
144 145 
         IPage<AddRegistNum> iPage = new Page<>(pageNum, pageSize);
145 
-        IPage<AddRegistNum> data = taActicityStaticMapper.selectActivityAddRegistNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, activityId, activityType, buildingId);
146 
+        IPage<AddRegistNum> data = taActicityStaticMapper.selectActivityAddRegistNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, activityId, activityType, buildingId, taPersonBuildings, userId);
146 147 
         return ResponseBean.success(data);
147 148 
     }
148 149
149 
-    public List<AddRegistNum> selectActivityAddRegistNumExport(Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String activityId, String activityType, String buildingId){
150 
-        return taActicityStaticMapper.selectActivityAddRegistNumExport(orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, activityId, activityType, buildingId);
150 
+    public List<AddRegistNum> selectActivityAddRegistNumExport(Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String activityId, String activityType, String buildingId, List<TaPersonBuilding> taPersonBuildings, Integer userId){
151 
+        return taActicityStaticMapper.selectActivityAddRegistNumExport(orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, activityId, activityType, buildingId, taPersonBuildings, userId);
151 152 
     }
152 153
153 154 
     public ResponseBean selectActivityVisitNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String provice, String realtyConsultant, String realtyConsultantPhone, String activityId, String activityType, String personId, String buildingId){

+ 10
- 0
src/main/resources/mapper/TaPersonVisitRecordMapper.xml Zobrazit soubor 

@@ -432,5 +432,15 @@
432 432 
             t.target_id, t.event_type;
433 433 
     </select>
434 434
435 
+    <select id="selectTodayVisitCount" resultType="java.lang.Integer">
436 
+        SELECT
437 
+        COUNT(1) as visit_count
438 
+        FROM
439 
+        ta_person_visit_record tp
440 
+        where tp.org_id = #{orgId} AND
441 
+        tp.event  = 'start'
442 
+        AND DATE_FORMAT(tp.visit_time,'%Y-%m-%d') = DATE_FORMAT(#{nowDate},'%Y-%m-%d')
443 
+    </select>
444 
+
435 445
436 446 
 </mapper>

+ 992
- 642
src/main/resources/mapper/statistic/TaActivityStaticMapper.xml
Diff nebyl zobrazen, protože je příliš veliký
Zobrazit soubor