新需求

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

@@ -158,13 +158,17 @@ public class ActivityStatisticController extends BaseController {
      * @return
      */
     @GetMapping(value = "/admin/activityStatistical/activitySharePersonNumExport")
-    public void selectActivitySharePersonNum(@RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+    public void selectActivitySharePersonNum(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum, @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
+                                             @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
                                              @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
                                              @RequestParam(value = "sharePersonType", required = false)String sharePersonType,
                                              @RequestParam(value = "sharePersonName", required = false)  String sharePersonName,
                                              @RequestParam(value = "sharePhone", required = false)String sharePhone,
+                                             @RequestParam(value = "activityId", required = false)String activityId,
+                                             @RequestParam(value = "activityType", required = false)String activityType,
                                              @RequestParam(value = "sort", required = false)String sort,
                                              @RequestParam(value = "colKey", required = false)String colKey,
+                                             @RequestParam(value = "buildingId", required = false)String buildingId,
                                              HttpServletRequest request, HttpServletResponse response) throws IOException {
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");
@@ -172,7 +176,7 @@ public class ActivityStatisticController extends BaseController {
         ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), SharePersonNum.class).registerWriteHandler(new CustomCellWriteHandler()).build();
         // 设置 sheet, 同一个sheet只需要设置一次
         WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
-        List<SharePersonNum> data = taActivityStaticService.selectActivitySharePersonNumExport(getOrgId(request), startDate, endDate, sharePersonType, sharePersonName, sharePhone, sort, colKey);
+        List<SharePersonNum> data = taActivityStaticService.selectActivitySharePersonNumExport(getOrgId(request), startDate, endDate, sharePersonType, sharePersonName, sharePhone, activityId, activityType, buildingId, sort, colKey);
         excelWriter.write(data, writeSheet);
         // finish 会帮忙关闭流
         excelWriter.finish();
@@ -209,6 +213,10 @@ public class ActivityStatisticController extends BaseController {
                                              @RequestParam(value = "sharePersonType", required = false)String sharePersonType,
                                              @RequestParam(value = "sharePersonName", required = false)  String sharePersonName,
                                              @RequestParam(value = "sharePhone", required = false)String sharePhone,
+                                             @RequestParam(value = "activityId", required = false)String activityId,
+                                             @RequestParam(value = "activityType", required = false)String activityType,
+                                             @RequestParam(value = "personId", required = false)String personId,
+                                             @RequestParam(value = "buildingId", required = false)String buildingId,
                                              @RequestParam(value = "sort", required = false)String sort,
                                              @RequestParam(value = "colKey", required = false)String colKey,
                                              HttpServletRequest request, HttpServletResponse response) throws IOException {
@@ -218,7 +226,7 @@ public class ActivityStatisticController extends BaseController {
         ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ShareNum.class).registerWriteHandler(new CustomCellWriteHandler()).build();
         // 设置 sheet, 同一个sheet只需要设置一次
         WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
-        List<ShareNum> data = taActivityStaticService.selectActivityShareNumExport(getOrgId(request), startDate, endDate, sharePersonType, sharePersonName, sharePhone, sort, colKey);
+        List<ShareNum> data = taActivityStaticService.selectActivityShareNumExport(getOrgId(request), startDate, endDate, sharePersonType, sharePersonName, sharePhone, activityId, activityType, personId, buildingId, sort, colKey);
         excelWriter.write(data, writeSheet);
         // finish 会帮忙关闭流
         excelWriter.finish();
@@ -235,8 +243,9 @@ public class ActivityStatisticController extends BaseController {
                                                @RequestParam(value = "personFrom", required = false)String personFrom,
                                                @RequestParam(value = "activityId", required = false)String activityId,
                                                @RequestParam(value = "activityType", required = false)String activityType,
+                                               @RequestParam(value = "buildingId", required = false)String buildingId,
                                                HttpServletRequest request) {
-        return taActivityStaticService.selectActivityAddRegistNum(pageNum, pageSize, getOrgId(request), startDate, endDate, personFrom, activityId, activityType);
+        return taActivityStaticService.selectActivityAddRegistNum(pageNum, pageSize, getOrgId(request), startDate, endDate, personFrom, activityId, activityType, buildingId);
     }
 
     /**
@@ -247,6 +256,9 @@ public class ActivityStatisticController extends BaseController {
     public void selectActivityAddRegistNumExport(@RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
                                                                @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
                                                                @RequestParam(value = "personFrom", required = false)String personFrom,
+                                                               @RequestParam(value = "activityId", required = false)String activityId,
+                                                               @RequestParam(value = "activityType", required = false)String activityType,
+                                                               @RequestParam(value = "buildingId", required = false)String buildingId,
                                                                HttpServletRequest request, HttpServletResponse response) throws IOException {
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");
@@ -254,7 +266,7 @@ public class ActivityStatisticController extends BaseController {
         ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), AddRegistNum.class).registerWriteHandler(new CustomCellWriteHandler()).build();
         // 设置 sheet, 同一个sheet只需要设置一次
         WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
-        List<AddRegistNum> data = taActivityStaticService.selectActivityAddRegistNumExport(getOrgId(request), startDate, endDate, personFrom);
+        List<AddRegistNum> data = taActivityStaticService.selectActivityAddRegistNumExport(getOrgId(request), startDate, endDate, personFrom, activityId, activityType, buildingId);
         excelWriter.write(data, writeSheet);
         // finish 会帮忙关闭流
         excelWriter.finish();
@@ -275,8 +287,9 @@ public class ActivityStatisticController extends BaseController {
                                                    @RequestParam(value = "activityId", required = false)String activityId,
                                                    @RequestParam(value = "activityType", required = false)String activityType,
                                                    @RequestParam(value = "personId", required = false)String personId,
+                                                   @RequestParam(value = "buildingId", required = false)String buildingId,
                                                    HttpServletRequest request) {
-        return taActivityStaticService.selectActivityVisitNum(pageNum, pageSize, getOrgId(request), startDate, endDate, personFrom, province, realtyConsultant, realtyConsultantPhone, activityId, activityType, personId);
+        return taActivityStaticService.selectActivityVisitNum(pageNum, pageSize, getOrgId(request), startDate, endDate, personFrom, province, realtyConsultant, realtyConsultantPhone, activityId, activityType, personId, buildingId);
     }
 
     /**
@@ -290,6 +303,10 @@ public class ActivityStatisticController extends BaseController {
                                                @RequestParam(value = "province", required = false)String province,
                                                @RequestParam(value = "realtyConsultant", required = false)String realtyConsultant,
                                                @RequestParam(value = "realtyConsultantPhone", required = false)String realtyConsultantPhone,
+                                               @RequestParam(value = "activityId", required = false)String activityId,
+                                               @RequestParam(value = "activityType", required = false)String activityType,
+                                               @RequestParam(value = "personId", required = false)String personId,
+                                               @RequestParam(value = "buildingId", required = false)String buildingId,
                                                HttpServletRequest request, HttpServletResponse response) throws IOException {
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");
@@ -297,7 +314,7 @@ public class ActivityStatisticController extends BaseController {
         ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), VisitNum.class).registerWriteHandler(new CustomCellWriteHandler()).build();
         // 设置 sheet, 同一个sheet只需要设置一次
         WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
-        List<VisitNum> data = taActivityStaticService.selectActivityVisitNumExport(getOrgId(request), startDate, endDate, personFrom, province, realtyConsultant, realtyConsultantPhone);
+        List<VisitNum> data = taActivityStaticService.selectActivityVisitNumExport(getOrgId(request), startDate, endDate, personFrom, province, realtyConsultant, realtyConsultantPhone, activityId, activityType, personId, buildingId);
         excelWriter.write(data, writeSheet);
         // finish 会帮忙关闭流
         excelWriter.finish();
@@ -318,8 +335,9 @@ public class ActivityStatisticController extends BaseController {
                                                @RequestParam(value = "personId", required = false)String personId,
                                                @RequestParam(value = "activityId", required = false)String activityId,
                                                @RequestParam(value = "activityType", required = false)String activityType,
+                                               @RequestParam(value = "buildingId", required = false)String buildingId,
                                                HttpServletRequest request) {
-        return taActivityStaticService.selectActivityVisitPersonNum(pageNum, pageSize, getOrgId(request), startDate, endDate, personFrom, province, realtyConsultant, realtyConsultantPhone, activityId, activityType, personId);
+        return taActivityStaticService.selectActivityVisitPersonNum(pageNum, pageSize, getOrgId(request), startDate, endDate, personFrom, province, realtyConsultant, realtyConsultantPhone, activityId, activityType, buildingId,  personId);
     }
 
     /**
@@ -333,6 +351,10 @@ public class ActivityStatisticController extends BaseController {
                                        @RequestParam(value = "province", required = false)String province,
                                        @RequestParam(value = "realtyConsultant", required = false)String realtyConsultant,
                                        @RequestParam(value = "realtyConsultantPhone", required = false)String realtyConsultantPhone,
+                                       @RequestParam(value = "personId", required = false)String personId,
+                                       @RequestParam(value = "activityId", required = false)String activityId,
+                                       @RequestParam(value = "activityType", required = false)String activityType,
+                                       @RequestParam(value = "buildingId", required = false)String buildingId,
                                        HttpServletRequest request, HttpServletResponse response) throws IOException {
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");
@@ -340,7 +362,7 @@ public class ActivityStatisticController extends BaseController {
         ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), VisitPersonNum.class).registerWriteHandler(new CustomCellWriteHandler()).build();
         // 设置 sheet, 同一个sheet只需要设置一次
         WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
-        List<VisitPersonNum> data = taActivityStaticService.selectActivityVisitPersonNumExport(getOrgId(request), startDate, endDate, personFrom, province, realtyConsultant, realtyConsultantPhone);
+        List<VisitPersonNum> data = taActivityStaticService.selectActivityVisitPersonNumExport(getOrgId(request), startDate, endDate, personFrom, province, realtyConsultant, realtyConsultantPhone, activityId, activityType, buildingId,  personId);
         excelWriter.write(data, writeSheet);
         // finish 会帮忙关闭流
         excelWriter.finish();

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

@@ -94,6 +94,9 @@ public interface TaActicityStaticMapper {
             @Param("sharePersonType") String sharePersonType,
             @Param("sharePersonName") String sharePersonName,
             @Param("sharePhone") String sharePhone,
+            @Param("activityId") String activityId,
+            @Param("activityType") String activityType,
+            @Param("buildingId") String buildingId,
             @Param("sort") String sort,
             @Param("colKey") String colKey
     );
@@ -121,6 +124,10 @@ public interface TaActicityStaticMapper {
             @Param("sharePersonType") String sharePersonType,
             @Param("sharePersonName") String sharePersonName,
             @Param("sharePhone") String sharePhone,
+            @Param("activityId") String activityId,
+            @Param("activityType") String activityType,
+            @Param("personId") String personId,
+            @Param("buildingId") String buildingId,
             @Param("sort") String sort,
             @Param("colKey") String colKey
     );
@@ -132,14 +139,18 @@ public interface TaActicityStaticMapper {
             @Param("endDate") LocalDateTime endDate,
             @Param("personFrom") String personFrom,
             @Param("activityId") String activityId,
-            @Param("activityType") String activityType
+            @Param("activityType") String activityType,
+            @Param("buildingId") String buildingId
     );
 
     List<AddRegistNum> selectActivityAddRegistNumExport(
             @Param("orgId") Integer orgId,
             @Param("startDate") LocalDateTime startDate,
             @Param("endDate") LocalDateTime endDate,
-            @Param("personFrom") String personFrom
+            @Param("personFrom") String personFrom,
+            @Param("activityId") String activityId,
+            @Param("activityType") String activityType,
+            @Param("buildingId") String buildingId
     );
 
     IPage<VisitNum> selectActivityVisitNum(
@@ -152,7 +163,8 @@ public interface TaActicityStaticMapper {
             @Param("realtyConsultant") String realtyConsultant,
             @Param("realtyConsultantPhone") String realtyConsultantPhone,
             @Param("activityId") String activityId,
-            @Param("activityType") String activityType
+            @Param("activityType") String activityType,
+            @Param("buildingId") String buildingId
     );
 
     List<VisitNum> selectActivityVisitNumExport(
@@ -162,7 +174,10 @@ public interface TaActicityStaticMapper {
             @Param("personFrom") String personFrom,
             @Param("province") String province,
             @Param("realtyConsultant") String realtyConsultant,
-            @Param("realtyConsultantPhone") String realtyConsultantPhone
+            @Param("realtyConsultantPhone") String realtyConsultantPhone,
+            @Param("activityId") String activityId,
+            @Param("activityType") String activityType,
+            @Param("buildingId") String buildingId
     );
 
     IPage<VisitPersonNum> selectActivityVisitPersonNum(
@@ -175,7 +190,8 @@ public interface TaActicityStaticMapper {
             @Param("realtyConsultant") String realtyConsultant,
             @Param("realtyConsultantPhone") String realtyConsultantPhone,
             @Param("activityId") String activityId,
-            @Param("activityType") String activityType
+            @Param("activityType") String activityType,
+            @Param("buildingId") String buildingId
     );
 
     List<VisitPersonNum> selectActivityVisitPersonNumExport(
@@ -185,7 +201,24 @@ public interface TaActicityStaticMapper {
             @Param("personFrom") String personFrom,
             @Param("province") String province,
             @Param("realtyConsultant") String realtyConsultant,
-            @Param("realtyConsultantPhone") String realtyConsultantPhone
+            @Param("realtyConsultantPhone") String realtyConsultantPhone,
+            @Param("activityId") String activityId,
+            @Param("activityType") String activityType,
+            @Param("buildingId") String buildingId
+    );
+
+    List<VisitPersonNum> selectActivityVisitPersonNumByPersonIdExport(
+            @Param("orgId") Integer orgId,
+            @Param("startDate") LocalDateTime startDate,
+            @Param("endDate") LocalDateTime endDate,
+            @Param("personFrom") String personFrom,
+            @Param("province") String province,
+            @Param("realtyConsultant") String realtyConsultant,
+            @Param("realtyConsultantPhone") String realtyConsultantPhone,
+            @Param("activityId") String activityId,
+            @Param("activityType") String activityType,
+            @Param("buildingId") String buildingId,
+            @Param("personId") String personId
     );
 
     IPage<VisitPersonNum> selectActivityVisitPersonNumByPersonId(
@@ -195,7 +228,18 @@ public interface TaActicityStaticMapper {
             @Param("endDate") LocalDateTime endDate,
             @Param("personId") String personId,
             @Param("activityId") String activityId,
-            @Param("activityType") String activityType
+            @Param("activityType") String activityType,
+            @Param("buildingId") String buildingId
+    );
+
+    List<VisitPersonNum> selectActivityVisitPersonNumExportByPersonId(
+            @Param("orgId") Integer orgId,
+            @Param("startDate") LocalDateTime startDate,
+            @Param("endDate") LocalDateTime endDate,
+            @Param("personId") String personId,
+            @Param("activityId") String activityId,
+            @Param("activityType") String activityType,
+            @Param("buildingId") String buildingId
     );
 
     IPage<VisitNum> selectActivityVisitNumByPersonId(
@@ -205,7 +249,18 @@ public interface TaActicityStaticMapper {
             @Param("endDate") LocalDateTime endDate,
             @Param("personId") String personId,
             @Param("activityId") String activityId,
-            @Param("activityType") String activityType
+            @Param("activityType") String activityType,
+            @Param("buildingId") String buildingId
+    );
+
+    List<VisitNum> selectActivityVisitNumExportByPersonId(
+            @Param("orgId") Integer orgId,
+            @Param("startDate") LocalDateTime startDate,
+            @Param("endDate") LocalDateTime endDate,
+            @Param("personId") String personId,
+            @Param("activityId") String activityId,
+            @Param("activityType") String activityType,
+            @Param("buildingId") String buildingId
     );
 
 }

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

@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -121,9 +122,9 @@ public class TaActivityStaticServiceImpl {
         return ResponseBean.success(data);
     }
 
-    public List<SharePersonNum> selectActivitySharePersonNumExport(Integer orgId, LocalDate startDate, LocalDate endDate, String sharePersonType, String sharePersonName, String sharePhone, String sort, String colKey){
+    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){
         String sortType = "ascend".equals(sort) ? "asc" : "desc";
-        return taActicityStaticMapper.selectActivitySharePersonNumExport(orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), sharePersonType, sharePersonName, sharePhone, sortType, colKey);
+        return taActicityStaticMapper.selectActivitySharePersonNumExport(orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), sharePersonType, sharePersonName, sharePhone, activityId, activityType, buildingId, sortType, colKey);
     }
 
     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){
@@ -134,51 +135,63 @@ public class TaActivityStaticServiceImpl {
         return ResponseBean.success(data);
     }
 
-    public List<ShareNum> selectActivityShareNumExport(Integer orgId, LocalDate startDate, LocalDate endDate, String sharePersonType, String sharePersonName, String sharePhone, String sort, String colKey){
+    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){
         String sortType = "ascend".equals(sort) ? "asc" : "desc";
-        return taActicityStaticMapper.selectActivityShareNumExport( orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), sharePersonType, sharePersonName, sharePhone, sortType, colKey);
+        return taActicityStaticMapper.selectActivityShareNumExport( orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), sharePersonType, sharePersonName, sharePhone, activityId, activityType, personId, buildingId, sortType, colKey);
     }
 
-    public ResponseBean selectActivityAddRegistNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String activityId, String activityType){
+    public ResponseBean selectActivityAddRegistNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String activityId, String activityType, String buildingId){
         IPage<AddRegistNum> iPage = new Page<>(pageNum, pageSize);
-        IPage<AddRegistNum> data = taActicityStaticMapper.selectActivityAddRegistNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, activityId, activityType);
+        IPage<AddRegistNum> data = taActicityStaticMapper.selectActivityAddRegistNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, activityId, activityType, buildingId);
         return ResponseBean.success(data);
     }
 
-    public List<AddRegistNum> selectActivityAddRegistNumExport(Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom){
-        return taActicityStaticMapper.selectActivityAddRegistNumExport(orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom);
+    public List<AddRegistNum> selectActivityAddRegistNumExport(Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String activityId, String activityType, String buildingId){
+        return taActicityStaticMapper.selectActivityAddRegistNumExport(orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, activityId, activityType, buildingId);
     }
 
-    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){
+    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){
         IPage<VisitNum> iPage = new Page<>(pageNum, pageSize);
         IPage<VisitNum> data;
         if (StringUtils.isEmpty(personId)){
-            data = taActicityStaticMapper.selectActivityVisitNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, provice, realtyConsultant, realtyConsultantPhone, activityId, activityType);
+            data = taActicityStaticMapper.selectActivityVisitNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, provice, realtyConsultant, realtyConsultantPhone, activityId, activityType, buildingId);
         }else{
-            data = taActicityStaticMapper.selectActivityVisitNumByPersonId(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personId, activityId, activityType);
+            data = taActicityStaticMapper.selectActivityVisitNumByPersonId(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personId, activityId, activityType, buildingId);
         }
 
         return ResponseBean.success(data);
     }
 
-    public List<VisitNum> selectActivityVisitNumExport(Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String provice, String realtyConsultant, String realtyConsultantPhone){
-        return taActicityStaticMapper.selectActivityVisitNumExport(orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, provice, realtyConsultant, realtyConsultantPhone);
+    public List<VisitNum> selectActivityVisitNumExport(Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String provice, String realtyConsultant, String realtyConsultantPhone, String activityId, String activityType, String personId, String buildingId){
+        List<VisitNum> list = new ArrayList<>();
+        if (StringUtils.isEmpty(personId)){
+            list = taActicityStaticMapper.selectActivityVisitNumExport(orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, provice, realtyConsultant, realtyConsultantPhone, activityId, activityType, buildingId);
+        }else{
+            list = taActicityStaticMapper.selectActivityVisitNumExportByPersonId(orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personId, activityId, activityType, buildingId);
+        }
+        return list;
     }
 
-    public ResponseBean selectActivityVisitPersonNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String provice, String realtyConsultant, String realtyConsultantPhone, String activityId, String activityType, String personId){
+    public ResponseBean selectActivityVisitPersonNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String provice, String realtyConsultant, String realtyConsultantPhone, String activityId, String activityType, String buildingId, String personId){
         IPage<VisitPersonNum> iPage = new Page<>(pageNum, pageSize);
         IPage<VisitPersonNum> data;
         if (StringUtils.isEmpty(personId)){
-            data = taActicityStaticMapper.selectActivityVisitPersonNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, provice, realtyConsultant, realtyConsultantPhone, activityId, activityType);
+            data = taActicityStaticMapper.selectActivityVisitPersonNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, provice, realtyConsultant, realtyConsultantPhone, activityId, activityType, buildingId);
         }else{
-            data = taActicityStaticMapper.selectActivityVisitPersonNumByPersonId(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personId, activityId, activityType);
+            data = taActicityStaticMapper.selectActivityVisitPersonNumByPersonId(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personId, activityId, activityType, buildingId);
         }
 
         return ResponseBean.success(data);
     }
 
-    public List<VisitPersonNum> selectActivityVisitPersonNumExport(Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String provice, String realtyConsultant, String realtyConsultantPhone){
-        return taActicityStaticMapper.selectActivityVisitPersonNumExport(orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, provice, realtyConsultant, realtyConsultantPhone);
+    public List<VisitPersonNum> selectActivityVisitPersonNumExport(Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String provice, String realtyConsultant, String realtyConsultantPhone, String activityId, String activityType, String buildingId, String personId){
+        List<VisitPersonNum> list = new ArrayList<>();
+        if (StringUtils.isEmpty(personId)){
+            list = taActicityStaticMapper.selectActivityVisitPersonNumExport(orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, provice, realtyConsultant, realtyConsultantPhone, activityId, activityType, buildingId);
+        }else{
+            list = taActicityStaticMapper.selectActivityVisitPersonNumExportByPersonId(orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personId, activityId, activityType, buildingId);
+        }
+        return list;
     }
 
 }

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

@@ -491,7 +491,7 @@
             and t.building_id =  #{buildingId}
         </if>
         <if test="targetType != null and targetType != ''">
-            and (case when #{targetType} = 'activity' then t.target_type = 'dynamic' else t.target_type = #{targetType} end)
+            and t.event_type = 'activity'
         </if>
         <if test="startDate != null">
             and t.visit_time &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
@@ -881,7 +881,7 @@
             select count(*) as addRegistNum ,addRegistNum.target_id, addRegistNum.target_type From (
                 select  count(*), a.* From ta_share_person_from a where a.target_type IN ( 'dynamic_share', 'h5_share', 'help_share', 'live_share', 'group_share' )  and a.org_id = #{orgId}
                 and a.status = 1
-                and t.is_first_time = 1
+                and a.is_first_time = 1
                 <if test="targetType != null and targetType != ''">
                     and a.target_type =  #{targetType}
                 </if>
@@ -1139,26 +1139,27 @@
         ) as shareNum on person.person_id = shareNum.person_id
 
         left join (
-            select count(1) as visitNum, t.share_person as person_id From ta_share_person_from t
-            left join
-            (
-            select a.person_id, b.user_id From ta_person a left join ta_user b on a.user_id = b.user_id where a.org_id = #{orgId}
-            ) as a on t.share_person = a.person_id or t.share_person = a.user_id
-            where t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%I:%S' ) and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%I:%S' )
-            and t.target_type in ('dynamic_share','h5_share','help_share','live_share', 'group_share') group by  t.share_person
+            SELECT t.visitNum, ifnull(a.person_id,b.person_id) AS person_id
+            FROM (
+            SELECT t.share_person, count(1) as visitNum
+            FROM ta_share_person_from t
+            WHERE t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%I:%S') AND t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%I:%S') AND t.target_type IN ('dynamic_share', 'h5_share', 'help_share', 'live_share', 'group_share')
+            and t.org_id = #{orgId} group by t.share_person ) t
+            left join ta_person a on t.share_person = a.person_id
+            left join ta_person b on t.share_person = b.person_id
         ) as visitNum on visitNum.person_id = person.person_id
 
         left join (
-            select count(1) as visitPersonNum, visitNum.share_person as person_id From (
-                select count(1), t.share_person From ta_share_person_from t
-                left join
-                (
-                select a.person_id, b.user_id From ta_person a left join ta_user b on a.user_id = b.user_id where a.org_id = #{orgId}
-                ) as a on t.share_person = a.person_id or t.share_person = a.user_id
-                where t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%I:%S' ) and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%I:%S' )
-                and t.target_type in ('dynamic_share','h5_share','help_share','live_share', 'group_share')
-                group by  t.person_id, t.share_person
-            ) as visitNum group by visitNum.share_person
+
+        SELECT t.visitPersonNum, ifnull(a.person_id,b.person_id) AS person_id
+        FROM (
+        SELECT count(DISTINCT t.person_id ) as visitPersonNum, t.share_person
+        FROM ta_share_person_from t
+        WHERE t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%I:%S' ) and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%I:%S' )
+        and t.target_type in ('dynamic_share','h5_share','help_share','live_share', 'group_share')
+        and t.org_id = #{orgId} ) t
+        left join ta_person a on t.share_person = a.person_id
+        left join ta_person b on t.share_person = b.person_id
         ) as visitPersonNum on visitPersonNum.person_id = person.person_id
         <if test="colKey == null or colKey == ''">
             order by person.create_date desc
@@ -1174,11 +1175,7 @@
         ifnull(shareNum, 0) as shareNum,
         ifnull(visitNum, 0) as visitNum,
         ifnull(visitPersonNum, 0) as visitPersonNum,
-        case
-        when person.person_type = 'customer' then '客户'
-        when person.person_type = 'drift' then '游客'
-        when person.person_type = 'Realty Consultant' then '置业顾问'
-        end as sharePersonType,
+        person.person_type as sharePersonType,
         person.person_id
         from (
         SELECT t.*, f.nickname, f.phone, f.person_type
@@ -1247,26 +1244,40 @@
         ) as shareNum on person.person_id = shareNum.person_id
 
         left join (
-        select count(1) as visitNum, t.share_person as person_id From ta_share_person_from t
-        left join
-        (
-        select a.person_id, b.user_id From ta_person a left join ta_user b on a.user_id = b.user_id where a.org_id = #{orgId}
-        ) as a on t.share_person = a.person_id or t.share_person = a.user_id
-        where t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%I:%S' ) and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%I:%S' )
-        and t.target_type in ('dynamic_share','h5_share','help_share','live_share', 'group_share') group by  t.share_person
+
+        select t.visitNum, a.person_id AS person_id From (
+        select t.share_person, count(1) as visitNum from ta_share_person_from t WHERE t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%I:%S') AND t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%I:%S') AND t.target_type IN ('dynamic_share', 'h5_share', 'help_share', 'live_share', 'group_share')
+        and t.org_id = #{orgId} group by t.share_person
+        ) t
+        LEFT JOIN (SELECT a.person_id, b.user_id
+        FROM ta_person a
+        LEFT JOIN ta_user b
+        ON a.user_id = b.user_id
+        WHERE a.org_id = #{orgId}) AS a
+        ON t.share_person = a.person_id OR t.share_person = a.user_id
+
         ) as visitNum on visitNum.person_id = person.person_id
 
         left join (
-        select count(1) as visitPersonNum, visitNum.share_person as person_id From (
-        select count(1), t.share_person From ta_share_person_from t
-        left join
-        (
-        select a.person_id, b.user_id From ta_person a left join ta_user b on a.user_id = b.user_id where a.org_id = #{orgId}
-        ) as a on t.share_person = a.person_id or t.share_person = a.user_id
-        where t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%I:%S' ) and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%I:%S' )
+
+        SELECT count(1) as visitPersonNum, visitPersonNum.share_person as person_id
+        FROM (
+        select t.*, a.person_id From (
+        SELECT count(1) as visitPersonNum , t.share_person
+        FROM ta_share_person_from t
+        WHERE t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%I:%S' ) and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%I:%S' )
         and t.target_type in ('dynamic_share','h5_share','help_share','live_share', 'group_share')
-        group by  t.person_id, t.share_person
-        ) as visitNum group by visitNum.share_person
+        and t.org_id = #{orgId} group by t.person_id
+        ) as t
+        LEFT JOIN (
+        SELECT a.person_id, b.user_id
+        FROM ta_person a
+        LEFT JOIN ta_user b
+        ON a.user_id = b.user_id
+        WHERE a.org_id = 84 ) as a
+        ON t.share_person = a.person_id or t.share_person = a.user_id
+        ) as visitPersonNum group by visitPersonNum.person_id
+
         ) as visitPersonNum on visitPersonNum.person_id = person.person_id
         <if test="colKey == null or colKey == ''">
             order by person.create_date desc
@@ -1435,6 +1446,9 @@
         <if test="personFrom != null and personFrom != ''">
             and b.scene_id = #{personFrom}
         </if>
+        <if test="buildingId != null and buildingId != ''">
+            and c.building_id = #{buildingId}
+        </if>
         group by t.person_id
     </select>
 
@@ -1460,9 +1474,18 @@
         and t.status = 1
         and t.is_first_time = 1
         and t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d' ) and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
+        <if test="activityId != null and activityId != ''">
+            and t.target_id = #{activityId}
+        </if>
+        <if test="activityType != null and activityType != ''">
+            and t.target_type = concat(#{activityType}, '_share')
+        </if>
         <if test="personFrom != null and personFrom != ''">
             and b.scene_id = #{personFrom}
         </if>
+        <if test="buildingId != null and buildingId != ''">
+            and c.building_id = #{buildingId}
+        </if>
     </select>
 
     <select id="selectActivityVisitNum" resultType="com.huiju.estateagents.excel.ActivityStatistics.VisitNum">
@@ -1493,6 +1516,9 @@
             <if test="activityType != null and activityType != ''">
                 and t.event_type = #{activityType}
             </if>
+            <if test="buildingId != null and buildingId != ''">
+                and t.building_id = #{buildingId}
+            </if>
             AND t.org_id = #{orgId}
             AND t.visit_time >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
             AND t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')
@@ -1543,6 +1569,15 @@
         'group',
         'h5'
         )
+        <if test="activityId != null and activityId != ''">
+            and t.target_id = #{activityId}
+        </if>
+        <if test="activityType != null and activityType != ''">
+            and t.event_type = #{activityType}
+        </if>
+        <if test="buildingId != null and buildingId != ''">
+            and t.building_id = #{buildingId}
+        </if>
         AND t.org_id = #{orgId}
         AND t.visit_time >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
         AND t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')
@@ -1551,8 +1586,8 @@
         left join ta_person_from_record b on a.person_id = b.person_id and b.org_id = #{orgId}
         left join td_wx_dict b1 on b.scene_id = b1.scene_id
         left join (
-            select d.person_id, d.`name`, d.phone From  ta_recommend_customer c
-            left join ta_person d on c.recommend_person = d.person_id where c.org_id = #{orgId} group by d.person_id
+        select d.person_id, d.`name`, d.phone From  ta_recommend_customer c
+        left join ta_person d on c.recommend_person = d.person_id where c.org_id = #{orgId} group by d.person_id
         ) as d on t.person_id = d.person_id
         <where>
             <if test="personFrom != null and personFrom != ''">
@@ -1605,6 +1640,9 @@
         <if test="activityType != null and activityType != ''">
             and t.event_type = #{activityType}
         </if>
+        <if test="buildingId != null and buildingId != ''">
+            and t.building_id = #{buildingId}
+        </if>
         GROUP BY
         t.person_id ) as t
         left join ta_person a on  t.person_id = a.person_id
@@ -1660,6 +1698,15 @@
         AND t.org_id = #{orgId}
         AND t.visit_time >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
         AND t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')
+        <if test="activityId != null and activityId != ''">
+            and t.target_id = #{activityId}
+        </if>
+        <if test="activityType != null and activityType != ''">
+            and t.event_type = #{activityType}
+        </if>
+        <if test="buildingId != null and buildingId != ''">
+            and t.building_id = #{buildingId}
+        </if>
         GROUP BY
         t.person_id ) as t
         left join ta_person a on  t.person_id = a.person_id
@@ -1747,4 +1794,69 @@
         left join ta_person d on c.recommend_person = d.person_id where c.org_id = #{orgId} group by d.person_id
         ) as d on t.person_id = d.person_id
     </select>
+
+    <select id="selectActivityVisitPersonNumExportByPersonId"
+            resultType="com.huiju.estateagents.excel.ActivityStatistics.VisitPersonNum">
+        select
+        a.nickname, a.phone,
+        if(a.gender = '1', '男', if(a.gender = '2', '女','未知') ) as gender,
+        a.province,
+        b1.scene_name as personFrom,
+        d.name as realtyConsultant,
+        d.phone as realtyConsultantPhone,
+        t.create_date as visitDate,
+        t.visitNum
+        From (
+        SELECT count(1) as visitNum, t.person_id, t.create_date
+        FROM ta_share_person_from t
+        LEFT JOIN (
+        SELECT a.person_id, b.user_id
+        FROM ta_person a
+        LEFT JOIN ta_user b
+        ON a.user_id = b.user_id
+        WHERE a.org_id = #{orgId} ) as a ON t.share_person = a.person_id or t.share_person = a.user_id
+        WHERE t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%I:%S' ) and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%I:%S' ) and t.target_type in ('dynamic_share','h5_share','help_share','live_share', 'group_share')
+        and t.share_person = #{personId} group by t.person_id
+        ) as t
+
+        left join ta_person a on  t.person_id = a.person_id
+        left join ta_person_from_record b on a.person_id = b.person_id and b.org_id = #{orgId}
+        left join td_wx_dict b1 on b.scene_id = b1.scene_id
+        left join (
+        select d.person_id, d.`name`, d.phone From  ta_recommend_customer c
+        left join ta_person d on c.recommend_person = d.person_id where c.org_id = #{orgId} group by d.person_id
+        ) as d on t.person_id = d.person_id
+    </select>
+
+    <select id="selectActivityVisitNumExportByPersonId"
+            resultType="com.huiju.estateagents.excel.ActivityStatistics.VisitNum">
+        select
+        a.nickname, a.phone,
+        if(a.gender = '1', '男', if(a.gender = '2', '女','未知') ) as gender,
+        a.province,
+        b1.scene_name as personFrom,
+        d.name as realtyConsultant,
+        d.phone as realtyConsultantPhone,
+        t.create_date as visitDate
+        From (
+        SELECT t.person_id, t.create_date
+        FROM ta_share_person_from t
+        LEFT JOIN (
+        SELECT a.person_id, b.user_id
+        FROM ta_person a
+        LEFT JOIN ta_user b
+        ON a.user_id = b.user_id
+        WHERE a.org_id = #{orgId} ) as a ON t.share_person = a.person_id or t.share_person = a.user_id
+        WHERE t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%I:%S' ) and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%I:%S' ) and t.target_type in ('dynamic_share','h5_share','help_share','live_share', 'group_share')
+        and t.share_person = #{personId}
+        ) as t
+
+        left join ta_person a on  t.person_id = a.person_id
+        left join ta_person_from_record b on a.person_id = b.person_id and b.org_id = #{orgId}
+        left join td_wx_dict b1 on b.scene_id = b1.scene_id
+        left join (
+        select d.person_id, d.`name`, d.phone From  ta_recommend_customer c
+        left join ta_person d on c.recommend_person = d.person_id where c.org_id = #{orgId} group by d.person_id
+        ) as d on t.person_id = d.person_id
+    </select>
 </mapper>