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

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v3.5.21</version>
+	<version>v3.5.28</version>
 	<name>estateages</name>
 	<description>置业经纪人</description>
 

src/main/java/com/huiju/estateagents/controller/ExtendContentController.java

@@ -111,7 +111,7 @@ public class ExtendContentController extends BaseController {
                 taBuildingQueryWrapper.eq("building_id", e.getBuildingId());
                 TaBuilding taBuilding = iTaBuildingService.getOne(taBuildingQueryWrapper);
                 e.setCityName(null == tdCity ? "" : tdCity.getName());
-                if (taBuilding != null){
+                if (taBuilding != null && e.getIsHaveActive()){
                     e.setBuildingName(taBuilding.getBuildingName());
                 }
             });

src/main/java/com/huiju/estateagents/controller/HelpActivityController.java

@@ -17,6 +17,7 @@ import com.huiju.estateagents.excel.HelpRecordExport;
 import com.huiju.estateagents.excel.PublicCustomerExport;
 import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
 import com.huiju.estateagents.mapper.HelpInitiateRecordMapper;
+import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
 import com.huiju.estateagents.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -457,7 +458,11 @@ public class HelpActivityController extends BaseController {
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "helpActivityId", paramType = "path", value = "活动状态")
     })
     @RequestMapping(value = "/wx/helpActivity/{helpActivityId}", method = RequestMethod.GET)
+    @ReportCustomer(type = "help")
     public ResponseBean wxHelpActivityGet(@PathVariable(value = "helpActivityId") Integer helpActivityId,
+                                          @RequestParam(value = "qrCodeId", required = false) String qrCodeId,
+                                          @RequestParam(value = "channelId", required = false) String channelId,
+                                          @RequestParam(value = "sceneId", required = false) String sceneId,
                                           HttpServletRequest request, @RequestParam(value = "initiateId",required = false) Integer initiateId) {
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);

src/main/java/com/huiju/estateagents/controller/MiniAppController.java

@@ -486,7 +486,7 @@ public class MiniAppController extends BaseController {
     /**
      * 获取用户绑定手机号信息
      */
-    @PostMapping("Phone")
+    @PostMapping("/userPhone")
     public ResponseBean phone(@RequestBody String paramStr, HttpServletRequest request) {
         String appid = request.getHeader("appid");
         JSONObject params = JSONObject.parseObject(paramStr);

src/main/java/com/huiju/estateagents/controller/TaBuildingController.java

@@ -11,6 +11,7 @@ import com.huiju.estateagents.entity.TaOrg;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.mapper.TaBuildingMapper;
 import com.huiju.estateagents.mapper.TaOrgMapper;
+import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
 import com.huiju.estateagents.service.ITaBuildingService;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaSaveService;
@@ -355,7 +356,12 @@ public class TaBuildingController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/wx/buildingSelectId/{id}", method = RequestMethod.GET)
-    public ResponseBean wxBuildingSelectId(@PathVariable(value = "id") String id, HttpServletRequest request) {
+    @ReportCustomer(type = "building")
+    public ResponseBean wxBuildingSelectId(@PathVariable(value = "id") String id,
+                                           @RequestParam(value = "qrCodeId", required = false) String qrCodeId,
+                                           @RequestParam(value = "channelId", required = false) String channelId,
+                                           @RequestParam(value = "sceneId", required = false) String sceneId,
+                                           HttpServletRequest request) {
         String openid = getOpenId(request);
         Integer orgId = getOrgId(request);
         List<TaPerson> persons = iTaPersonService.getPersonsByOpenId(openid);

src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java

@@ -19,6 +19,7 @@ import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
 import com.huiju.estateagents.excel.TaActivityDynamicEnlistExport;
 import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
 import com.huiju.estateagents.mapper.*;
+import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
 import com.huiju.estateagents.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -272,7 +273,11 @@ public class TaBuildingDynamicController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, name = "dynamicId", paramType = "path",value = "活动ID")
     })
     @RequestMapping(value = "/wx/buildingDynamiceInfo/{dynamicId}", method = RequestMethod.GET)
+    @ReportCustomer(type = "activity")
     public ResponseBean iBuildingDynamicInfo(@PathVariable(value = "dynamicId") String dynamicId,
+                                             @RequestParam(value = "qrCodeId", required = false) String qrCodeId,
+                                             @RequestParam(value = "channelId", required = false) String channelId,
+                                             @RequestParam(value = "sceneId", required = false) String sceneId,
                                              HttpServletRequest request){
         String openid = getOpenId(request);
         Integer orgId = getOrgId(request);

src/main/java/com/huiju/estateagents/controller/TaChannelController.java

@@ -1,10 +1,15 @@
 package com.huiju.estateagents.controller;
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaChannel;
+import com.huiju.estateagents.excel.ActivityStatistics.*;
+import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
 import com.huiju.estateagents.mapper.TaChannelMapper;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.TaChannelService;
@@ -19,6 +24,8 @@ import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.time.LocalDate;
 import java.util.HashMap;
 import java.util.List;
@@ -256,11 +263,13 @@ public class TaChannelController extends BaseController {
                                                      @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 = "channelType", required = false)String channelType,
+                                                     @RequestParam(value = "targetType", required = false)String targetType,
                                                      @RequestParam(value = "buildingId", required = false)String buildingId,
                                                      @RequestParam(value = "channelId") Integer channelId,
+                                                     @RequestParam(value = "sortField", required = false) String sortField,
+                                                     @RequestParam(value = "sortOrder", required = false) String sortOrder,
                                                      HttpServletRequest request) {
-        return taChannelService.getChannelIntroductionList(pageNum, pageSize, getOrgId(request), startDate, endDate, channelType, buildingId, channelId);
+        return taChannelService.getChannelIntroductionList(pageNum, pageSize, getOrgId(request), startDate, endDate, targetType, buildingId, channelId,sortField,sortOrder, getTaPersonBuildingListByUserId(request));
     }
 
     /**
@@ -274,8 +283,10 @@ public class TaChannelController extends BaseController {
                                        @RequestParam(value = "targetType", required = false) String targetType,
                                        @RequestParam(value = "buildingId", required = false) String buildingId,
                                        @RequestParam(value = "channelId", required = false) Integer channelId,
+                                       @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,
                                        HttpServletRequest request) {
-        return taChannelService.getNewuserList(pageNum, pageSize, getOrgId(request), channelId, targetId, targetType, buildingId);
+        return taChannelService.getNewuserList(pageNum, pageSize, getOrgId(request), channelId, targetId, targetType, buildingId,startDate,endDate);
     }
 
     /**
@@ -289,8 +300,10 @@ public class TaChannelController extends BaseController {
                                        @RequestParam(value = "targetType", required = false) String targetType,
                                        @RequestParam(value = "buildingId", required = false) String buildingId,
                                        @RequestParam(value = "channelId", required = false) Integer channelId,
+                                       @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,
                                        HttpServletRequest request) {
-        return taChannelService.getVisitNumList(pageNum, pageSize, getOrgId(request), channelId, targetId, targetType, buildingId);
+        return taChannelService.getVisitNumList(pageNum, pageSize, getOrgId(request), channelId, targetId, targetType, buildingId,startDate,endDate);
     }
 
 
@@ -305,7 +318,105 @@ public class TaChannelController extends BaseController {
                                         @RequestParam(value = "targetType", required = false) String targetType,
                                         @RequestParam(value = "buildingId", required = false) String buildingId,
                                         @RequestParam(value = "channelId", required = false) Integer channelId,
+                                         @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,
                                         HttpServletRequest request) {
-        return taChannelService.getPersonNumList(pageNum, pageSize, getOrgId(request), channelId, targetId, targetType, buildingId);
+        return taChannelService.getPersonNumList(pageNum, pageSize, getOrgId(request), channelId, targetId, targetType, buildingId,startDate,endDate);
+    }
+
+    /**
+     * 渠道引进客户统计导出
+     * @return
+     */
+    @GetMapping(value = "/admin/channel/introductionListExport")
+    public void getChannelIntroductionListExport(@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 = "targetType", required = false)String targetType,
+                                                         @RequestParam(value = "buildingId", required = false)String buildingId,
+                                                         @RequestParam(value = "channelId") Integer channelId,
+                                                         HttpServletRequest request, HttpServletResponse response) throws IOException {
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=引进注册用户.xlsx");
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), TsChannelDaily.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        // 设置 sheet, 同一个sheet只需要设置一次
+        WriteSheet writeSheet = EasyExcel.writerSheet("引进注册用户").build();
+        List<TsChannelDaily> data = taChannelService.getChannelIntroductionListExport(getOrgId(request), startDate, endDate, targetType, buildingId, channelId, getTaPersonBuildingListByUserId(request));
+        excelWriter.write(data, writeSheet);
+        // finish 会帮忙关闭流
+        excelWriter.finish();
+    }
+
+    /**
+     * 渠道注册用户列表导出
+     * @return
+     */
+    @GetMapping(value = "/admin/channel/introduction/newuserListExport")
+    public void getNewuserListExport(@RequestParam(value = "targetId", required = false) String targetId,
+                                       @RequestParam(value = "targetType", required = false) String targetType,
+                                       @RequestParam(value = "buildingId", required = false) String buildingId,
+                                       @RequestParam(value = "channelId", required = false) Integer channelId,
+                                     @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,
+                                       HttpServletRequest request,HttpServletResponse response) throws IOException {
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=注册用户.xlsx");
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ChannelAddRegistNum.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        // 设置 sheet, 同一个sheet只需要设置一次
+        WriteSheet writeSheet = EasyExcel.writerSheet("注册用户").build();
+        List<ChannelAddRegistNum> data =  taChannelService.getNewuserListExport(getOrgId(request), channelId, targetId, targetType, buildingId,startDate,endDate);
+        excelWriter.write(data, writeSheet);
+        // finish 会帮忙关闭流
+        excelWriter.finish();
+    }
+
+    /**
+     * 渠道访问次数列表导出
+     * @return
+     */
+    @GetMapping(value = "/admin/channel/introduction/visitNumListExport")
+    public void getVisitNumListExport(@RequestParam(value = "targetId", required = false) String targetId,
+                                        @RequestParam(value = "targetType", required = false) String targetType,
+                                        @RequestParam(value = "buildingId", required = false) String buildingId,
+                                        @RequestParam(value = "channelId", required = false) Integer channelId,
+                                      @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,
+                                        HttpServletRequest request,HttpServletResponse response) throws IOException {
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=访问次数.xlsx");
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ChannelVisitNum.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        // 设置 sheet, 同一个sheet只需要设置一次
+        WriteSheet writeSheet = EasyExcel.writerSheet("访问次数").build();
+        List<ChannelVisitNum> data = taChannelService.getVisitNumListExport(getOrgId(request), channelId, targetId, targetType, buildingId,startDate,endDate);
+        excelWriter.write(data, writeSheet);
+        // finish 会帮忙关闭流
+        excelWriter.finish();
+    }
+
+
+    /**
+     * 渠道访问人数列表导出
+     * @return
+     */
+    @GetMapping(value = "/admin/channel/introduction/personNumListExport")
+    public void getPersonNumListExport(@RequestParam(value = "targetId", required = false) String targetId,
+                                         @RequestParam(value = "targetType", required = false) String targetType,
+                                         @RequestParam(value = "buildingId", required = false) String buildingId,
+                                         @RequestParam(value = "channelId", required = false) Integer channelId,
+                                       @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,
+                                         HttpServletRequest request,HttpServletResponse response) throws IOException {
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=访问人数.xlsx");
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ChannelVisitPersonNum.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        // 设置 sheet, 同一个sheet只需要设置一次
+        WriteSheet writeSheet = EasyExcel.writerSheet("访问人数").build();
+        List<ChannelVisitPersonNum> data = taChannelService.getPersonNumListExport(getOrgId(request), channelId, targetId, targetType, buildingId,startDate,endDate);
+        excelWriter.write(data, writeSheet);
+        // finish 会帮忙关闭流
+        excelWriter.finish();
     }
 }

src/main/java/com/huiju/estateagents/controller/TaHousingResourcesController.java

@@ -7,6 +7,7 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.po.TaHousingResourcesPO;
+import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
 import com.huiju.estateagents.service.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -244,9 +245,14 @@ public class TaHousingResourcesController extends BaseController {
      * @author gushaoyong
      */
     @RequestMapping(value = "/wx/listHousingResources", method = RequestMethod.GET)
+    @ReportCustomer(type = "house")
     public ResponseBean listHousingResources(@RequestParam(value = "salesBatchId") String salesBatchId,
-                                             String startPrice, String endPrice, String apartmentId, @RequestParam(value = "source", required = false) String source,
-                                             HttpServletRequest request) {
+                                             @RequestParam(value = "qrCodeId", required = false) String qrCodeId,
+                                             @RequestParam(value = "channelId", required = false) String channelId,
+                                             @RequestParam(value = "sceneId", required = false) String sceneId,
+                                             HttpServletRequest request,
+                                             String startPrice, String endPrice, String apartmentId, @RequestParam(value = "source", required = false) String source
+                                             ) {
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
         String openid = getOpenId(request);

src/main/java/com/huiju/estateagents/controller/TaLiveActivityController.java

@@ -8,6 +8,7 @@ import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.ExtendContent;
 import com.huiju.estateagents.entity.TaLiveActivity;
+import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
 import com.huiju.estateagents.service.IExtendContentService;
 import com.huiju.estateagents.service.ITaLiveActivityService;
 import org.slf4j.Logger;
@@ -221,7 +222,12 @@ public class TaLiveActivityController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/wx/taLiveActivity/{id}", method = RequestMethod.GET)
-    public ResponseBean getLiveActivityDetailById(@PathVariable("id") String id, HttpServletRequest request) {
+    @ReportCustomer(type = "live")
+    public ResponseBean getLiveActivityDetailById(@PathVariable("id") String id,
+                                                  @RequestParam(value = "qrCodeId", required = false) String qrCodeId,
+                                                  @RequestParam(value = "channelId", required = false) String channelId,
+                                                  @RequestParam(value = "sceneId", required = false) String sceneId,
+                                                  HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean = iTaLiveActivityService.getLiveActivityDetailById(id, getOrgId(request));

src/main/java/com/huiju/estateagents/controller/TaNewsController.java

@@ -10,6 +10,7 @@ import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.entity.TaBuildingDynamic;
 import com.huiju.estateagents.entity.TaNews;
 import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
 import com.huiju.estateagents.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -215,7 +216,12 @@ public class TaNewsController extends BaseController {
      * @param id  实体ID
      */
     @RequestMapping(value="/wx/taNews/{id}",method= RequestMethod.GET)
-    public ResponseBean wxTaNewsGet(@PathVariable Integer id,HttpServletRequest request){
+    @ReportCustomer(type = "news")
+    public ResponseBean wxTaNewsGet(@PathVariable Integer id,
+                                    @RequestParam(value = "qrCodeId", required = false) String qrCodeId,
+                                    @RequestParam(value = "channelId", required = false) String channelId,
+                                    @RequestParam(value = "sceneId", required = false) String sceneId,
+                                    HttpServletRequest request){
         String openid = getOpenId(request);
         List<TaPerson> persons = iTaPersonService.getPersonsByOpenId(openid);
         if (null == persons || persons.size() == 0) {

src/main/java/com/huiju/estateagents/controller/TaPersonController.java

@@ -784,8 +784,15 @@ public class TaPersonController extends BaseController {
     }
 
     @PutMapping("/wx/userInfo/updatePhoto")
-    public ResponseBean updateUserPhoto(String photoUrl, HttpServletRequest request){
+    public ResponseBean updateUserPhoto(@RequestBody Map<String, String> photoUrl, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+
         String openId = getOpenId(request);
-        return taPersonService.updateUserPhoto(photoUrl, openId);
+        String imgUrl = photoUrl.get("photoUrl");
+        if (StringUtils.isEmpty(imgUrl)){
+            responseBean.addError("请上传图片");
+            return responseBean;
+        }
+        return taPersonService.updateUserPhoto(imgUrl, openId);
     }
 }

src/main/java/com/huiju/estateagents/controller/TaQrcodeController.java

@@ -1,17 +1,14 @@
 package com.huiju.estateagents.controller;
 
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.ExcelWriter;
-import com.alibaba.excel.support.ExcelTypeEnum;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaQrcode;
-import com.huiju.estateagents.excel.ActivityStatistics.VisitPersonNum;
-import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.service.ITaQrcodeService;
-import org.apache.poi.sl.usermodel.Sheet;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,8 +17,9 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.io.OutputStream;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -40,10 +38,6 @@ public class TaQrcodeController extends BaseController {
     @Autowired
     public ITaQrcodeService iTaQrcodeService;
 
-    @Autowired
-    private IMiniAppService iMiniAppService;
-
-
     /**
      * 分页查询列表
      *
@@ -60,7 +54,8 @@ public class TaQrcodeController extends BaseController {
                 targetType, targetName, channelId, buildingId);
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaQrcodeService.listQrCodeByCondition(pageNum, pageSize, targetType, targetName, channelId, buildingId, getOrgId(request));
+            List<TaPersonBuilding> personBuildingList = getTaPersonBuildingListByUserId(request);
+            responseBean = iTaQrcodeService.listQrCodeByCondition(pageNum, pageSize, targetType, targetName, channelId, buildingId, getUserId(request), getOrgId(request), personBuildingList);
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taQrcodeList -=- {}", e.toString());
@@ -79,6 +74,11 @@ public class TaQrcodeController extends BaseController {
     public ResponseBean saveQrcode(@RequestBody TaQrcode taQrcode, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
+            // 校验参数
+            if (StringUtils.isBlank(taQrcode.getTargetId()) || StringUtils.isBlank(taQrcode.getTargetType())) {
+                responseBean.addError("参数错误");
+                return responseBean;
+            }
             responseBean = iTaQrcodeService.saveQrcode(taQrcode, getUserId(request), getOrgId(request));
         } catch (Exception e) {
             e.printStackTrace();
@@ -208,7 +208,7 @@ public class TaQrcodeController extends BaseController {
      * @param request
      * @return
      */
-    @RequestMapping(value = "/admin/getStatisticRecord", method = RequestMethod.GET)
+    @RequestMapping(value = "/admin/qrCode/getStatisticRecord", method = RequestMethod.GET)
     public ResponseBean getStatisticRecord(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                            @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                            Integer qrCodeId, Integer type, HttpServletRequest request) {
@@ -222,18 +222,20 @@ public class TaQrcodeController extends BaseController {
         return responseBean;
     }
 
-    @RequestMapping(value = "/admin/getStatisticRecordExport", method = RequestMethod.GET)
-    public void getStatisticRecordExport(Integer qrCodeId, Integer type, HttpServletRequest request, HttpServletResponse response) {
+    @RequestMapping(value = "/admin/qrCode/getStatisticRecordExport", method = RequestMethod.GET)
+    public void getStatisticRecordExport(@RequestParam(value = "qrCodeId") Integer qrCodeId,
+                                         @RequestParam(value = "type") Integer type, HttpServletRequest request, HttpServletResponse response) throws IOException {
         try {
             iTaQrcodeService.getStatisticRecordExport(type, qrCodeId, getOrgId(request), response);
         } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            try {
-                response.getOutputStream().close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
+            logger.error("getStatisticRecordExport 异常：", e);
+            response.reset();
+            response.setContentType("application/json");
+            response.setCharacterEncoding("utf-8");
+            Map<String, Object> map = new HashMap();
+            map.put("code", ResponseBean.ERROR_UNAVAILABLE);
+            map.put("message", "下载文件失败" + e.getMessage());
+            response.getWriter().println(JSON.toJSONString(map));
         }
     }
 

src/main/java/com/huiju/estateagents/controller/TaShareActivityController.java

@@ -363,7 +363,11 @@ public class TaShareActivityController extends BaseController {
     @RequestMapping(value="/wx/taShareActivity/{groupActivityId}",method= RequestMethod.GET)
     @ReportCustomer(type = "group")
     public ResponseBean wxShareActivityGet(@PathVariable Integer groupActivityId,
-                                           HttpServletRequest request, @RequestParam(value = "recordId",required = false) Integer recordId ){
+                                           @RequestParam(value = "qrCodeId", required = false) String qrCodeId,
+                                           @RequestParam(value = "channelId", required = false) String channelId,
+                                           @RequestParam(value = "sceneId", required = false) String sceneId,
+                                           HttpServletRequest request,
+                                           @RequestParam(value = "recordId",required = false) Integer recordId ){
         ResponseBean responseBean = new ResponseBean();
         String openid = getOpenId(request);
         Integer orgId = getOrgId(request);

src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageController.java

@@ -15,6 +15,7 @@ import com.huiju.estateagents.entity.ExtendContent;
 import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.mapper.TaMiniappMapper;
+import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
 import com.huiju.estateagents.service.IExtendContentService;
 import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
@@ -91,6 +92,7 @@ public class TaDrainageController extends BaseController {
             }
             queryWrapper.eq(null != status,"status",status);
             queryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id",buildingId);
+            queryWrapper.isNull(StringUtils.isEmpty(buildingId),"building_id");
             queryWrapper.eq(null != drainageId,"drainage_id",drainageId);
             queryWrapper.and(taPersonBuildingList.size() > 0, wapper -> wapper.in("building_id",taPersonBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList())).or().eq("create_user",getUserId(request)));
             queryWrapper.like(!StringUtils.isEmpty(name),"name",name);
@@ -332,7 +334,12 @@ public class TaDrainageController extends BaseController {
      * @param id  实体ID
      */
     @RequestMapping(value="/wx/taDrainage/{id}",method= RequestMethod.GET)
-    public ResponseBean wxDrainageGet(@PathVariable Integer id, HttpServletRequest request){
+    @ReportCustomer(type = "h5")
+    public ResponseBean wxDrainageGet(@PathVariable Integer id,
+                                      @RequestParam(value = "qrCodeId", required = false) String qrCodeId,
+                                      @RequestParam(value = "channelId", required = false) String channelId,
+                                      @RequestParam(value = "sceneId", required = false) String sceneId,
+                                      HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(iTaDrainageService.getById(id));

src/main/java/com/huiju/estateagents/entity/ExtendContent.java

@@ -104,6 +104,8 @@ public class ExtendContent implements Serializable {
      */
     private Integer createUser;
 
+    private Boolean isHaveActive;
+
     /**
      * 排序
      */

src/main/java/com/huiju/estateagents/entity/TaCustomerFrom.java

@@ -19,7 +19,6 @@ import lombok.experimental.Accessors;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
 public class TaCustomerFrom implements Serializable {
 
     private static final long serialVersionUID = 1L;

src/main/java/com/huiju/estateagents/entity/TaPersonVisitRecord.java

@@ -214,4 +214,8 @@ public class TaPersonVisitRecord implements Serializable {
      */
     @TableField(exist = false)
     private String city;
+
+    private Integer qrCodeId;
+
+    private Integer channelId;
 }

src/main/java/com/huiju/estateagents/excel/ActivityStatistics/ChannelVisitNum.java

@@ -34,46 +34,46 @@ public class ChannelVisitNum {
     @ExcelProperty(value = "归属地", index = 3)
     private String province;
 
-    /**
-     * 来源渠道
-     */
-    @ColumnWidth(15)
-    @ExcelProperty(value = "来源渠道", index = 4)
-    private String personFrom;
-
-    /**
-     * 置业顾问
-     */
-    @ColumnWidth(15)
-    @ExcelProperty(value = "置业顾问", index = 5)
-    private String realtyConsultant;
-
-    /**
-     * 置业顾问电话
-     */
-    @ColumnWidth(15)
-    @ExcelProperty(value = "置业顾问电话", index = 6)
-    private String realtyConsultantPhone;
-
-    /**
-     * 分享者
-     */
-    @ColumnWidth(15)
-    @ExcelProperty(value = "分享者", index = 7)
-    private String sharePersonName;
-
-    /**
-     * 分享者电话
-     */
-    @ColumnWidth(15)
-    @ExcelProperty(value = "分享者电话", index = 8)
-    private String sharePersonPhone;
+//    /**
+//     * 来源渠道
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "来源渠道", index = 4)
+//    private String personFrom;
+//
+//    /**
+//     * 置业顾问
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "置业顾问", index = 5)
+//    private String realtyConsultant;
+//
+//    /**
+//     * 置业顾问电话
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "置业顾问电话", index = 6)
+//    private String realtyConsultantPhone;
+//
+//    /**
+//     * 分享者
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "分享者", index = 7)
+//    private String sharePersonName;
+//
+//    /**
+//     * 分享者电话
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "分享者电话", index = 8)
+//    private String sharePersonPhone;
 
     /**
      * 访问时间
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "访问时间", index = 9)
+    @ExcelProperty(value = "访问时间", index = 4)
     private String visitDate;
 
 }

src/main/java/com/huiju/estateagents/excel/ActivityStatistics/ChannelVisitPersonNum.java

@@ -34,33 +34,33 @@ public class ChannelVisitPersonNum {
     @ExcelProperty(value = "归属地", index = 3)
     private String province;
 
-    /**
-     * 来源渠道
-     */
-    @ColumnWidth(15)
-    @ExcelProperty(value = "来源渠道", index = 4)
-    private String personFrom;
-
-    /**
-     * 置业顾问
-     */
-    @ColumnWidth(15)
-    @ExcelProperty(value = "置业顾问", index = 5)
-    private String realtyConsultant;
-
-    /**
-     * 置业顾问电话
-     */
-    @ColumnWidth(15)
-    @ExcelProperty(value = "置业顾问电话", index = 6)
-    private String realtyConsultantPhone;
-
-    /**
-     * 推广人
-     */
-    @ColumnWidth(15)
-    @ExcelProperty(value = "推广人", index = 7)
-    private String sharePersonName;
+//    /**
+//     * 来源渠道
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "来源渠道", index = 4)
+//    private String personFrom;
+//
+//    /**
+//     * 置业顾问
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "置业顾问", index = 5)
+//    private String realtyConsultant;
+//
+//    /**
+//     * 置业顾问电话
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "置业顾问电话", index = 6)
+//    private String realtyConsultantPhone;
+//
+//    /**
+//     * 推广人
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "推广人", index = 7)
+//    private String sharePersonName;
 //    /**
 //     * 分享者
 //     */
@@ -79,7 +79,7 @@ public class ChannelVisitPersonNum {
      * 访问次数
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "访问次数", index = 8)
+    @ExcelProperty(value = "访问次数", index = 4)
     private String visitNum;
 
 

src/main/java/com/huiju/estateagents/excel/ActivityStatistics/TsChannelDaily.java

@@ -0,0 +1,51 @@
+package com.huiju.estateagents.excel.ActivityStatistics;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+@Data
+public class TsChannelDaily {
+    /**
+     * 类型
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "类型", index = 0)
+    private String targetType;
+
+    /**
+     * 内容
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "内容", index = 1)
+    private String targetName;
+
+    /**
+     * 关联项目
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "关联项目", index = 2)
+    private String buildingName;
+
+    /**
+     * 新增注册用户
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "新增注册用户", index = 3)
+    private Integer newCustomers;
+
+    /**
+     * 访问人数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "访问人数", index = 4)
+    private Integer visitPersons;
+
+    /**
+     * 访问次数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "访问次数", index = 5)
+    private Integer visitNum;
+
+}

src/main/java/com/huiju/estateagents/excel/QrCodeStatistics/QrCodeNewPersonNum.java

@@ -41,5 +41,5 @@ public class QrCodeNewPersonNum {
      */
     @ColumnWidth(15)
     @ExcelProperty(value = "注册时间", index = 4)
-    private LocalDateTime registerTime;
+    private String registerTime;
 }

src/main/java/com/huiju/estateagents/excel/QrCodeStatistics/QrCodeVisitNum.java

@@ -41,5 +41,5 @@ public class QrCodeVisitNum {
      */
     @ColumnWidth(15)
     @ExcelProperty(value = "访问时间", index = 4)
-    private LocalDateTime visitTime;
+    private String visitTime;
 }

src/main/java/com/huiju/estateagents/mapper/TaChannelMapper.java

@@ -3,10 +3,12 @@ package com.huiju.estateagents.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaChannel;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TsActivityDaily;
 import com.huiju.estateagents.excel.ActivityStatistics.ChannelAddRegistNum;
 import com.huiju.estateagents.excel.ActivityStatistics.ChannelVisitNum;
 import com.huiju.estateagents.excel.ActivityStatistics.ChannelVisitPersonNum;
+import com.huiju.estateagents.excel.ActivityStatistics.TsChannelDaily;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -55,11 +57,19 @@ public interface TaChannelMapper extends BaseMapper<TaChannel> {
      * @param buildingId
      * @return
      */
-    IPage<TsActivityDaily> getChannelIntroductionList(IPage<TsActivityDaily> pg,@Param("orgId") Integer orgId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate,@Param("channelType") String channelType,@Param("buildingId") String buildingId,@Param("channelId") Integer channelId);
+    IPage<TsActivityDaily> getChannelIntroductionList(IPage<TsActivityDaily> pg, @Param("orgId") Integer orgId, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate, @Param("channelType") String channelType, @Param("buildingId") String buildingId, @Param("channelId") Integer channelId, @Param("sortField") String sortField, @Param("orderType") String orderType, @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings);
 
-    IPage<ChannelAddRegistNum> getChannelNewuserList(IPage<ChannelAddRegistNum> iPage, @Param("orgId") Integer orgId, @Param("channelId") Integer channelId, @Param("activityId") String activityId, @Param("activityType") String activityType, @Param("buildingId") String buildingId);
+    IPage<ChannelAddRegistNum> getChannelNewuserList(IPage<ChannelAddRegistNum> iPage, @Param("orgId") Integer orgId, @Param("channelId") Integer channelId, @Param("activityId") String activityId, @Param("activityType") String activityType, @Param("buildingId") String buildingId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
 
-    IPage<ChannelVisitNum> getChannelVisitNumList(IPage<ChannelVisitNum> iPage,@Param("orgId") Integer orgId,@Param("channelId") Integer channelId,@Param("targetId") String targetId,@Param("targetType") String targetType,@Param("buildingId") String buildingId);
+    IPage<ChannelVisitNum> getChannelVisitNumList(IPage<ChannelVisitNum> iPage,@Param("orgId") Integer orgId,@Param("channelId") Integer channelId,@Param("targetId") String targetId,@Param("targetType") String targetType,@Param("buildingId") String buildingId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
 
-    IPage<ChannelVisitPersonNum> getChannelPersonNumList(IPage<ChannelVisitPersonNum> iPage,@Param("orgId") Integer orgId,@Param("channelId") Integer channelId,@Param("targetId") String targetId,@Param("targetType") String targetType,@Param("buildingId") String buildingId);
+    IPage<ChannelVisitPersonNum> getChannelPersonNumList(IPage<ChannelVisitPersonNum> iPage,@Param("orgId") Integer orgId,@Param("channelId") Integer channelId,@Param("targetId") String targetId,@Param("targetType") String targetType,@Param("buildingId") String buildingId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
+
+    List<TsChannelDaily> getChannelIntroductionListExport(@Param("orgId") Integer orgId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate,@Param("channelType") String channelType,@Param("buildingId") String buildingId,@Param("channelId") Integer channelId,@Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings);
+
+    List<ChannelAddRegistNum> getChannelNewuserListExport( @Param("orgId") Integer orgId, @Param("channelId") Integer channelId, @Param("activityId") String activityId, @Param("activityType") String activityType, @Param("buildingId") String buildingId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
+
+    List<ChannelVisitNum> getChannelVisitNumListExport(@Param("orgId") Integer orgId,@Param("channelId") Integer channelId,@Param("targetId") String targetId,@Param("targetType") String targetType,@Param("buildingId") String buildingId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
+
+    List<ChannelVisitPersonNum> getChannelPersonNumListExport(@Param("orgId") Integer orgId,@Param("channelId") Integer channelId,@Param("targetId") String targetId,@Param("targetType") String targetType,@Param("buildingId") String buildingId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
 }

src/main/java/com/huiju/estateagents/mapper/TaQrcodeMapper.java

@@ -3,6 +3,7 @@ package com.huiju.estateagents.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.bo.request.QrCodeStatisticResponseBO;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
 import com.huiju.estateagents.entity.TaQrcode;
 import com.huiju.estateagents.excel.QrCodeStatistics.QrCodeNewPersonNum;
@@ -33,7 +34,9 @@ public interface TaQrcodeMapper extends BaseMapper<TaQrcode> {
                                           @Param("targetName") String targetName,
                                           @Param("channelId") Integer channelId,
                                           @Param("buildingId") String buildingId,
-                                          @Param("orgId") Integer orgId);
+                                          @Param("userId") Integer userId,
+                                          @Param("orgId") Integer orgId,
+                                          @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
     /**
      * 获取访问用户人数

src/main/java/com/huiju/estateagents/reportCustomerAop/ReportCustomer.java

@@ -6,7 +6,6 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.servlet.http.HttpServletRequest;
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.METHOD})

src/main/java/com/huiju/estateagents/reportCustomerAop/ReportCustomerAspect.java

@@ -1,23 +1,22 @@
 package com.huiju.estateagents.reportCustomerAop;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
 import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.After;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.alibaba.fastjson.JSONObject;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
@@ -29,12 +28,12 @@ import com.huiju.estateagents.mapper.TaBuildingMapper;
 import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.service.ITaRecommendCustomerService;
 
-import io.swagger.models.auth.In;
-
 @Aspect
 @Component
 public class ReportCustomerAspect extends BaseController {
 
+    private final Logger logger = LoggerFactory.getLogger(ReportCustomerAspect.class);
+
     @Autowired
     private ITaRecommendCustomerService iTaRecommendCustomerService;
 
@@ -42,7 +41,10 @@ public class ReportCustomerAspect extends BaseController {
     TaPersonMapper taPersonMapper;
 
     @Autowired
-    private TaBuildingMapper taBuildingMapper;
+    TaBuildingMapper taBuildingMapper;
+
+    @Autowired
+    ReportCustomerImpl reportCustomerImpl;
 
 
     /** 以自定义 @ReportCustomer 注解为切点 */
@@ -51,58 +53,58 @@ public class ReportCustomerAspect extends BaseController {
 
     }
 
-    @Before("reportCustomer()")
+    @After("reportCustomer()")
     public ResponseBean doAround(JoinPoint proceedingJoinPoint) throws Throwable {
         ResponseBean responseBean = new ResponseBean();
         try{
             ReportCustomer reportCustomer = ((MethodSignature)proceedingJoinPoint.getSignature()).getMethod().getAnnotation(ReportCustomer.class);
             //获取请求参数
             Object[] args = proceedingJoinPoint.getArgs();
-            HttpServletRequest request = (HttpServletRequest)args[1];
+            String targetType = reportCustomer.type();
+            String targetId = String.valueOf(args[0]);
+            String qrCodeId = String.valueOf(args[1]);
+            String channelId = String.valueOf(args[2]);
+            String sceneId = String.valueOf(args[3]);
+            HttpServletRequest request = (HttpServletRequest)args[4];
 
+            Map<String, Object> stringObjectMap = getBuildingByIdAndType(targetId, targetType);
             if (request == null){
                 responseBean.addError("未授权，不进行操作");
                 return responseBean;
             }
 
-            String params = request.getHeader("reportInfo");
-            JSONObject paramObject = JSONObject.parseObject(params);
+            String consultantPersonId = request.getHeader("x-consultant");
+            String recommend = request.getHeader("x-recommender");
 
             List<TaPerson> persons = getPersonsByOpenId(getOpenId(request));
             TaPerson taPerson = persons.get(0);
             Integer orgId = getOrgId(request);
 
-            // 楼盘ID
-            String buildingId = paramObject.getString("buildingId");
-            // 场景ID
-            String sceneId = paramObject.getString("sceneId");
-            // 访问目标
-            String targetType = reportCustomer.type();
-            // 目标ID
-            String targetId = paramObject.getString("targetId");
-            // 目标名称
-            String targetName = paramObject.getString("targetName");
-            // 推广用户
-            String promoter = paramObject.getString("promoter");
-
-            TaCustomerFrom  taCustomerFrom = assembleVO(taPerson, targetType, targetId, targetName, orgId, sceneId);
+            TaCustomerFrom  taCustomerFrom = assembleVO(taPerson, targetType, targetId, stringObjectMap.get("targetName").toString(), orgId, sceneId, channelId, qrCodeId);
             // 推广人
-            TaPerson recPerson = StringUtils.isEmpty(promoter) ? null : taPersonMapper.getById(promoter);
+            TaPerson recPerson = StringUtils.isEmpty(recommend) ? null : taPersonMapper.getById(recommend);
             // 是否置业顾问
             boolean isConsultant = null != recPerson && CommConstant.PERSON_REALTY_CONSULTANT.equals(recPerson.getPersonType());
+            TaPerson consultantInfo = null != consultantPersonId ? reportCustomerImpl.getPerson(consultantPersonId) : (isConsultant ? recPerson : null);
             // 推荐楼盘
-            TaBuilding building = StringUtils.isEmpty(buildingId) ? null : taBuildingMapper.selectById(buildingId);
+            TaBuilding taBuilding = (TaBuilding) stringObjectMap.get("taBuilding");
+            TaBuilding building = taBuilding == null ? null : taBuildingMapper.selectById(taBuilding.getBuildingId());
 
-            iTaRecommendCustomerService.newCustomer(orgId, taPerson, recPerson, isConsultant ? recPerson : null, building, taCustomerFrom);
+            if (StringUtils.isEmpty(taPerson.getPhone())) {
+                responseBean.addError("未授权，不进行操作");
+                return responseBean;
+            }
+            iTaRecommendCustomerService.newCustomer(orgId, taPerson, recPerson, consultantInfo, building, taCustomerFrom);
             responseBean.addSuccess("绑定成功");
 
         }catch (Exception e){
+            logger.error("绑定失败");
             responseBean.addError("失败");
         }
         return responseBean;
     }
 
-    public TaCustomerFrom assembleVO(TaPerson person, String targetType, String targetId, String targetName, Integer orgId, String sceneId){
+    public TaCustomerFrom assembleVO(TaPerson person, String targetType, String targetId, String targetName, Integer orgId, String sceneId, String channelId, String qrCodeId){
         // 客户来源
         TaCustomerFrom customerFrom = new TaCustomerFrom();
         customerFrom.setPersonId(person.getPersonId());
@@ -112,6 +114,12 @@ public class ReportCustomerAspect extends BaseController {
         customerFrom.setTargetName(targetName);
         customerFrom.setOrgId(orgId);
         customerFrom.setSceneId(sceneId);
+        if (!StringUtils.isEmpty(channelId)){
+            customerFrom.setChannelId(Integer.valueOf(channelId));
+        }
+        if(!StringUtils.isEmpty(qrCodeId)){
+            customerFrom.setQrCodeId(Integer.valueOf(qrCodeId));
+        }
         customerFrom.setCreateDate(LocalDateTime.now());
 
         return customerFrom;
@@ -120,4 +128,39 @@ public class ReportCustomerAspect extends BaseController {
     public List<TaPerson> getPersonsByOpenId(String openId){
         return taPersonMapper.getPersonByOpenId(openId);
     }
+
+    public Map<String, Object> getBuildingByIdAndType(String targetId, String targetType){
+        Map<String, Object> buildingAndNameInfo = null;
+
+        switch (targetType){
+            case CommConstant.FAVOR_ACTIVITY:
+                buildingAndNameInfo = reportCustomerImpl.selectActivityBuildingInfo(targetId);
+                break;
+            case CommConstant.POINTS_CHANGE_HELP:
+                buildingAndNameInfo = reportCustomerImpl.selectHelpBuildingInfo(targetId);
+                break;
+            case CommConstant.POINTS_CHANGE_GROUP:
+                buildingAndNameInfo = reportCustomerImpl.selectGroupBuildingInfo(targetId);
+                break;
+            case CommConstant.LIVE:
+                buildingAndNameInfo = reportCustomerImpl.selectLiveBuildingInfo(targetId);
+                break;
+            case CommConstant.EVENT_H5:
+                buildingAndNameInfo = reportCustomerImpl.selectH5BuildingInfo(targetId);
+                break;
+            case CommConstant.FAVOR_NEWS:
+                buildingAndNameInfo = reportCustomerImpl.selectNewsBuildingInfo(targetId);
+                break;
+            case CommConstant.HOUSE:
+                buildingAndNameInfo = reportCustomerImpl.selectHouseBuildingInfo(targetId);
+                break;
+            default:
+                buildingAndNameInfo = reportCustomerImpl.selectBuildingInfo(targetId);
+                break;
+        }
+
+        return buildingAndNameInfo;
+    }
+
+
 }

src/main/java/com/huiju/estateagents/reportCustomerAop/ReportCustomerImpl.java

@@ -0,0 +1,180 @@
+package com.huiju.estateagents.reportCustomerAop;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.drainage.entity.TaDrainage;
+import com.huiju.estateagents.drainage.mapper.TaDrainageMapper;
+import com.huiju.estateagents.entity.HelpActivity;
+import com.huiju.estateagents.entity.TaBuilding;
+import com.huiju.estateagents.entity.TaBuildingDynamic;
+import com.huiju.estateagents.entity.TaLiveActivity;
+import com.huiju.estateagents.entity.TaNews;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaSalesBatch;
+import com.huiju.estateagents.entity.TaShareActivity;
+import com.huiju.estateagents.mapper.HelpActivityMapper;
+import com.huiju.estateagents.mapper.TaBuildingDynamicMapper;
+import com.huiju.estateagents.mapper.TaBuildingMapper;
+import com.huiju.estateagents.mapper.TaLiveActivityMapper;
+import com.huiju.estateagents.mapper.TaNewsMapper;
+import com.huiju.estateagents.mapper.TaPersonMapper;
+import com.huiju.estateagents.mapper.TaSalesBatchMapper;
+import com.huiju.estateagents.mapper.TaShareActivityMapper;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+public class ReportCustomerImpl extends ServiceImpl<TaPersonMapper, TaPerson> {
+
+    @Autowired
+    private TaBuildingMapper taBuildingMapper;
+
+    @Autowired
+    private TaNewsMapper taNewsMapper;
+
+    @Autowired
+    private TaBuildingDynamicMapper taBuildingDynamicMapper;
+
+    @Autowired
+    private HelpActivityMapper helpActivityMapper;
+
+    @Autowired
+    private TaShareActivityMapper taShareActivityMapper;
+
+    @Autowired
+    private TaLiveActivityMapper taLiveActivityMapper;
+
+    @Autowired
+    private TaDrainageMapper taDrainageMapper;
+
+    @Autowired
+    private TaSalesBatchMapper taSalesBatchMapper;
+
+
+    public Map<String, Object> selectActivityBuildingInfo(String targetId){
+        Map<String, Object> map = new HashMap<>();
+
+        QueryWrapper<TaBuildingDynamic> taBuildingDynamicQueryWrapper = new QueryWrapper<>();
+        taBuildingDynamicQueryWrapper.eq("dynamic_id", targetId);
+        TaBuildingDynamic taBuildingDynamic = taBuildingDynamicMapper.selectOne(taBuildingDynamicQueryWrapper);
+        map.put("targetName", taBuildingDynamic.getTitle());
+
+        TaBuilding taBuilding = buildingInfo(taBuildingDynamic.getBuildingId());
+        map.put("taBuilding", taBuilding);
+
+        return map;
+    }
+
+    public Map<String, Object> selectHelpBuildingInfo(String targetId){
+        Map<String, Object> map = new HashMap<>();
+
+        QueryWrapper<HelpActivity> helpActivityQueryWrapper = new QueryWrapper<>();
+        helpActivityQueryWrapper.eq("help_activity_id", targetId);
+        HelpActivity helpActivity = helpActivityMapper.selectOne(helpActivityQueryWrapper);
+        map.put("targetName", helpActivity.getTitle());
+
+        TaBuilding taBuilding = buildingInfo(helpActivity.getBuildingId());
+        map.put("taBuilding", taBuilding);
+
+        return map;
+    }
+
+    public Map<String, Object> selectGroupBuildingInfo(String targetId){
+        Map<String, Object> map = new HashMap<>();
+
+        QueryWrapper<TaShareActivity> taShareActivityQueryWrapper = new QueryWrapper<>();
+        taShareActivityQueryWrapper.eq("group_activity_id", targetId);
+        TaShareActivity taShareActivity = taShareActivityMapper.selectOne(taShareActivityQueryWrapper);
+        map.put("targetName", taShareActivity.getActivityName());
+
+        TaBuilding taBuilding = buildingInfo(taShareActivity.getBuildingId());
+        map.put("taBuilding", taBuilding);
+
+        return map;
+    }
+
+    public Map<String, Object> selectLiveBuildingInfo(String targetId){
+        Map<String, Object> map = new HashMap<>();
+
+        QueryWrapper<TaLiveActivity> taLiveActivityQueryWrapper = new QueryWrapper<>();
+        taLiveActivityQueryWrapper.eq("live_activity_id", targetId);
+        TaLiveActivity taLiveActivity = taLiveActivityMapper.selectOne(taLiveActivityQueryWrapper);
+        map.put("targetName", taLiveActivity.getLiveActivityTitle());
+
+        TaBuilding taBuilding = buildingInfo(taLiveActivity.getBuildingId());
+        map.put("taBuilding", taBuilding);
+
+        return map;
+    }
+
+    public Map<String, Object> selectH5BuildingInfo(String targetId){
+        Map<String, Object> map = new HashMap<>();
+
+        QueryWrapper<TaDrainage> taDrainageQueryWrapper = new QueryWrapper<>();
+        taDrainageQueryWrapper.eq("drainage_id", targetId);
+        TaDrainage taDrainage = taDrainageMapper.selectOne(taDrainageQueryWrapper);
+        map.put("targetName", taDrainage.getName());
+
+        TaBuilding taBuilding = buildingInfo(taDrainage.getBuildingId());
+        map.put("taBuilding", taBuilding);
+
+        return map;
+    }
+
+    public Map<String, Object> selectBuildingInfo(String targetId){
+        Map<String, Object> map = new HashMap<>();
+
+        QueryWrapper<TaBuilding> taBuildingQueryWrapper = new QueryWrapper<>();
+        taBuildingQueryWrapper.eq("building_id", targetId);
+        TaBuilding taBuilding = taBuildingMapper.selectOne(taBuildingQueryWrapper);
+        map.put("targetName", taBuilding.getBuildingName());
+        map.put("taBuilding", taBuilding);
+        return map;
+    }
+
+    public Map<String, Object> selectNewsBuildingInfo(String targetId){
+        Map<String, Object> map = new HashMap<>();
+
+        QueryWrapper<TaNews> taNewsQueryWrapper = new QueryWrapper<>();
+        taNewsQueryWrapper.eq("news_id", targetId);
+        TaNews taNews = taNewsMapper.selectOne(taNewsQueryWrapper);
+        map.put("targetName", taNews.getNewsName());
+
+        TaBuilding taBuilding = buildingInfo(taNews.getBuildingId());
+        map.put("taBuilding", taBuilding);
+
+        return map;
+    }
+
+    public TaBuilding buildingInfo(String buildingId){
+        QueryWrapper<TaBuilding> taBuildingQueryWrapper = new QueryWrapper<>();
+        taBuildingQueryWrapper.eq("building_id", buildingId);
+        TaBuilding taBuilding = taBuildingMapper.selectOne(taBuildingQueryWrapper);
+        return taBuilding;
+    }
+
+    public Map<String, Object> selectHouseBuildingInfo(String targetId){
+        Map<String, Object> map = new HashMap<>();
+
+        QueryWrapper<TaSalesBatch> taSalesBatchQueryWrapper = new QueryWrapper<>();
+        taSalesBatchQueryWrapper.eq("sales_batch_id", targetId);
+        TaSalesBatch taSalesBatch = taSalesBatchMapper.selectOne(taSalesBatchQueryWrapper);
+        map.put("targetName", taSalesBatch.getSalesBatchName());
+
+        TaBuilding taBuilding = buildingInfo(taSalesBatch.getBuildingId());
+        map.put("taBuilding", taBuilding);
+
+        return map;
+    }
+
+    public TaPerson getPerson(String personId){
+        return getById(personId);
+    }
+}

src/main/java/com/huiju/estateagents/service/ITaQrcodeService.java

@@ -3,6 +3,7 @@ package com.huiju.estateagents.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaQrcode;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -10,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.List;
 
 /**
  * <p>
@@ -21,7 +23,8 @@ import java.io.IOException;
  */
 public interface ITaQrcodeService extends IService<TaQrcode> {
 
-    ResponseBean listQrCodeByCondition(Integer pageNum, Integer pageSize, String targetType, String targetName, Integer channelId, String buildingId, Integer orgId);
+    ResponseBean listQrCodeByCondition(Integer pageNum, Integer pageSize, String targetType, String targetName, Integer channelId,
+                                       String buildingId, Integer userId, Integer orgId, List<TaPersonBuilding> personBuildingList);
 
     ResponseBean saveQrcode(TaQrcode taQrcode, Integer userId, Integer orgId);
 

src/main/java/com/huiju/estateagents/service/TaChannelService.java

@@ -1,9 +1,16 @@
 package com.huiju.estateagents.service;
+
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaChannel;
+import com.huiju.estateagents.entity.TaPersonBuilding;
+import com.huiju.estateagents.excel.ActivityStatistics.ChannelAddRegistNum;
+import com.huiju.estateagents.excel.ActivityStatistics.ChannelVisitNum;
+import com.huiju.estateagents.excel.ActivityStatistics.ChannelVisitPersonNum;
+import com.huiju.estateagents.excel.ActivityStatistics.TsChannelDaily;
 
 import java.time.LocalDate;
+import java.util.List;
 
 /**
  * <p>
@@ -26,7 +33,7 @@ public interface TaChannelService extends IService<TaChannel> {
      * @param buildingId
      * @return
      */
-    ResponseBean getChannelIntroductionList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String channelType, String buildingId, Integer channelId);
+    ResponseBean getChannelIntroductionList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String channelType, String buildingId, Integer channelId,String sortField,String sortOrder, List<TaPersonBuilding> taPersonBuildings);
 
     /**
      * 获取注册用户列表
@@ -39,7 +46,7 @@ public interface TaChannelService extends IService<TaChannel> {
      * @param buildingId
      * @return
      */
-    ResponseBean getNewuserList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId);
+    ResponseBean getNewuserList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate);
 
     /**
      * 获取渠道下的访问次数列表
@@ -52,7 +59,7 @@ public interface TaChannelService extends IService<TaChannel> {
      * @param buildingId
      * @return
      */
-    ResponseBean getVisitNumList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId);
+    ResponseBean getVisitNumList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate);
 
     /**
      * 获取渠道下的访问人数列表
@@ -65,5 +72,50 @@ public interface TaChannelService extends IService<TaChannel> {
      * @param buildingId
      * @return
      */
-    ResponseBean getPersonNumList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId);
+    ResponseBean getPersonNumList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate);
+
+    /**
+     * 导出
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param channelType
+     * @param buildingId
+     * @param channelId
+     * @return
+     */
+    List<TsChannelDaily> getChannelIntroductionListExport(Integer orgId, LocalDate startDate, LocalDate endDate, String channelType, String buildingId, Integer channelId, List<TaPersonBuilding> taPersonBuildings);
+
+    /**
+     * 导出
+     * @param orgId
+     * @param channelId
+     * @param targetId
+     * @param targetType
+     * @param buildingId
+     * @return
+     */
+    List<ChannelAddRegistNum> getNewuserListExport(Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate);
+
+    /**
+     * 导出
+     * @param orgId
+     * @param channelId
+     * @param targetId
+     * @param targetType
+     * @param buildingId
+     * @return
+     */
+    List<ChannelVisitNum> getVisitNumListExport(Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate);
+
+    /**
+     * 导出
+     * @param orgId
+     * @param channelId
+     * @param targetId
+     * @param targetType
+     * @param buildingId
+     * @return
+     */
+    List<ChannelVisitPersonNum> getPersonNumListExport(Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate);
 }

src/main/java/com/huiju/estateagents/service/impl/ExtendContentServiceImpl.java

@@ -187,11 +187,12 @@ public class ExtendContentServiceImpl extends ServiceImpl<ExtendContentMapper, E
             taExtendContentQueryWrapper.eq("org_id", orgId);
             taExtendContentQueryWrapper.eq("status", 1);
             taExtendContentQueryWrapper.eq("show_type", extendContent.getShowType());
+            taExtendContentQueryWrapper.eq("show_position", extendContent.getShowPosition());
             if (null != extendContent.getContentId()){
                 taExtendContentQueryWrapper.ne("content_id", extendContent.getContentId());
             }
-            if (CommConstant.BANNER_BUILDING.equals(extendContent.getShowPosition())){
-                taExtendContentQueryWrapper.eq("building_id", extendContent.getBuildingId());
+            if (extendContent.getIsHaveActive() != null ){
+                taExtendContentQueryWrapper.eq(StringUtils.isNotBlank(extendContent.getBuildingId()), "building_id", extendContent.getBuildingId());
             }
             List<ExtendContent> extContentInfo = extendContentMapper.selectList(taExtendContentQueryWrapper);
             if (!Collections.isEmpty(extContentInfo)){

src/main/java/com/huiju/estateagents/service/impl/TaChannelServiceImpl.java

@@ -4,18 +4,21 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaChannel;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TsActivityDaily;
 import com.huiju.estateagents.excel.ActivityStatistics.ChannelAddRegistNum;
 import com.huiju.estateagents.excel.ActivityStatistics.ChannelVisitNum;
 import com.huiju.estateagents.excel.ActivityStatistics.ChannelVisitPersonNum;
-import com.huiju.estateagents.excel.ActivityStatistics.VisitPersonNum;
+import com.huiju.estateagents.excel.ActivityStatistics.TsChannelDaily;
 import com.huiju.estateagents.mapper.TaChannelMapper;
 import com.huiju.estateagents.service.TaChannelService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
+import java.util.List;
 
 /**
  * <p>
@@ -44,9 +47,19 @@ public class TaChannelServiceImpl extends ServiceImpl<TaChannelMapper, TaChannel
      * @return
      */
     @Override
-    public ResponseBean getChannelIntroductionList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String channelType, String buildingId, Integer channelId) {
+    public ResponseBean getChannelIntroductionList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String channelType, String buildingId, Integer channelId,String sortField,String sortOrder, List<TaPersonBuilding> taPersonBuildings) {
         IPage<TsActivityDaily> pg = new Page<>(pageNum, pageSize);
-        IPage<TsActivityDaily> data = taChannelMapper.getChannelIntroductionList(pg, orgId,startDate,endDate,channelType,buildingId, channelId);
+        String orderType = "asc";
+        if ("descend".equals(sortOrder)){
+            orderType = "desc";
+        }else if ("ascend".equals(sortOrder)){
+            orderType = "asc";
+        }
+        if(StringUtils.isEmpty(sortField)){
+            sortField = "new_customers";
+            orderType = "desc";
+        }
+        IPage<TsActivityDaily> data = taChannelMapper.getChannelIntroductionList(pg, orgId,startDate,endDate,channelType,buildingId, channelId, sortField, orderType,taPersonBuildings);
         return ResponseBean.success(data);
     }
 
@@ -63,9 +76,9 @@ public class TaChannelServiceImpl extends ServiceImpl<TaChannelMapper, TaChannel
      * @return
      */
     @Override
-    public ResponseBean getNewuserList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId) {
+    public ResponseBean getNewuserList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate) {
         IPage<ChannelAddRegistNum> iPage = new Page<>(pageNum, pageSize);
-        IPage<ChannelAddRegistNum> data = taChannelMapper.getChannelNewuserList(iPage, orgId, channelId, targetId,targetType, buildingId);
+        IPage<ChannelAddRegistNum> data = taChannelMapper.getChannelNewuserList(iPage, orgId, channelId, targetId,targetType, buildingId,startDate,endDate);
         return ResponseBean.success(data);
     }
 
@@ -82,9 +95,9 @@ public class TaChannelServiceImpl extends ServiceImpl<TaChannelMapper, TaChannel
      * @return
      */
     @Override
-    public ResponseBean getVisitNumList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId) {
+    public ResponseBean getVisitNumList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate) {
         IPage<ChannelVisitNum> iPage = new Page<>(pageNum, pageSize);
-        IPage<ChannelVisitNum> data = taChannelMapper.getChannelVisitNumList(iPage, orgId, channelId, targetId, targetType, buildingId);
+        IPage<ChannelVisitNum> data = taChannelMapper.getChannelVisitNumList(iPage, orgId, channelId, targetId, targetType, buildingId,startDate,endDate);
         return ResponseBean.success(data);
     }
 
@@ -101,9 +114,101 @@ public class TaChannelServiceImpl extends ServiceImpl<TaChannelMapper, TaChannel
      * @return
      */
     @Override
-    public ResponseBean getPersonNumList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId) {
+    public ResponseBean getPersonNumList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate) {
         IPage<ChannelVisitPersonNum> iPage = new Page<>(pageNum, pageSize);
-        IPage<ChannelVisitPersonNum> data = taChannelMapper.getChannelPersonNumList(iPage, orgId, channelId, targetId, targetType, buildingId);
+        IPage<ChannelVisitPersonNum> data = taChannelMapper.getChannelPersonNumList(iPage, orgId, channelId, targetId, targetType, buildingId,startDate,endDate);
         return ResponseBean.success(data);
     }
+
+    /**
+     * 导出
+     *
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param channelType
+     * @param buildingId
+     * @param channelId
+     * @return
+     */
+    @Override
+    public List<TsChannelDaily> getChannelIntroductionListExport(Integer orgId, LocalDate startDate, LocalDate endDate, String channelType, String buildingId, Integer channelId, List<TaPersonBuilding> taPersonBuildings) {
+        List<TsChannelDaily> channelIntroductionListExport = taChannelMapper.getChannelIntroductionListExport(orgId, startDate, endDate, channelType, buildingId, channelId,taPersonBuildings);
+        channelIntroductionListExport.forEach(e -> {
+            String message = "";
+            switch (e.getTargetType()){
+                case "building":
+                    message = "项目";
+                    break;
+                case "activity":
+                    message = "常规活动";
+                    break;
+                case "help":
+                    message = "助力活动";
+                    break;
+                case "group":
+                    message = "拼团活动";
+                    break;
+                case "h5":
+                    message = "H5活动";
+                    break;
+                case "live":
+                    message = "直播活动";
+                    break;
+                case "news":
+                    message = "资讯";
+                    break;
+                case "house":
+                    message = "在线选房";
+                    break;
+            }
+            e.setTargetType(message);
+        });
+        return channelIntroductionListExport;
+    }
+
+    /**
+     * 导出
+     *
+     * @param orgId
+     * @param channelId
+     * @param targetId
+     * @param targetType
+     * @param buildingId
+     * @return
+     */
+    @Override
+    public List<ChannelAddRegistNum> getNewuserListExport(Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate) {
+        return taChannelMapper.getChannelNewuserListExport(orgId, channelId, targetId,targetType, buildingId,startDate,endDate);
+    }
+
+    /**
+     * 导出
+     *
+     * @param orgId
+     * @param channelId
+     * @param targetId
+     * @param targetType
+     * @param buildingId
+     * @return
+     */
+    @Override
+    public List<ChannelVisitNum> getVisitNumListExport(Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate) {
+        return taChannelMapper.getChannelVisitNumListExport(orgId, channelId, targetId, targetType, buildingId,startDate,endDate);
+    }
+
+    /**
+     * 导出
+     *
+     * @param orgId
+     * @param channelId
+     * @param targetId
+     * @param targetType
+     * @param buildingId
+     * @return
+     */
+    @Override
+    public List<ChannelVisitPersonNum> getPersonNumListExport(Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate) {
+        return taChannelMapper.getChannelPersonNumListExport(orgId, channelId, targetId, targetType, buildingId,startDate,endDate);
+    }
 }

src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java

@@ -413,13 +413,17 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         }
 
         TaPerson taPerson = taPersons.get(0);
+        QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
+        taUserQueryWrapper.eq("user_id", taPerson.getUserId());
+        TaUser taUser = taUserMapper.selectOne(taUserQueryWrapper);
+
         Map<String, Object> result = new HashMap<>();
         result.put("id", taPerson.getPersonId());
         result.put("name", taPerson.getName());
         result.put("liked", false);
         result.put("unReadNum", 0);
         result.put("nickname", taPerson.getNickname());
-        result.put("avatar", taPerson.getAvatarurl());
+        result.put("avatar", taUser == null ? taPerson.getAvatarurl() : taUser.getPhoto());
         result.put("sex", taPerson.getSex());
         result.put("phone",StringUtils.ifNull(taPerson.getTel(),taPerson.getPhone()) );
         result.put("points", taPerson.getPoints());

src/main/java/com/huiju/estateagents/service/impl/TaQrcodeServiceImpl.java

@@ -7,9 +7,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.service.impl.TaUserServiceImpl;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.WxQrCodeUtils;
 import com.huiju.estateagents.entity.TaMiniapp;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
 import com.huiju.estateagents.entity.TaQrcode;
 import com.huiju.estateagents.excel.QrCodeStatistics.QrCodeNewPersonNum;
@@ -19,6 +22,7 @@ import com.huiju.estateagents.mapper.TaMiniappMapper;
 import com.huiju.estateagents.mapper.TaQrcodeMapper;
 import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.service.ITaQrcodeService;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,6 +31,7 @@ import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.net.URLEncoder;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -52,6 +57,9 @@ public class TaQrcodeServiceImpl extends ServiceImpl<TaQrcodeMapper, TaQrcode> i
     @Autowired
     private IMiniAppService iMiniAppService;
 
+    @Autowired
+    private TaUserServiceImpl taUserService;
+
     /**
      * 条件查询二维码列表
      *
@@ -65,10 +73,17 @@ public class TaQrcodeServiceImpl extends ServiceImpl<TaQrcodeMapper, TaQrcode> i
      * @return
      */
     @Override
-    public ResponseBean listQrCodeByCondition(Integer pageNum, Integer pageSize, String targetType, String targetName, Integer channelId, String buildingId, Integer orgId) {
+    public ResponseBean listQrCodeByCondition(Integer pageNum, Integer pageSize, String targetType, String targetName, Integer channelId,
+                                              String buildingId, Integer userId, Integer orgId, List<TaPersonBuilding> personBuildingList) {
         ResponseBean responseBean = new ResponseBean();
+
+        TaUser taUser = taUserService.getById(userId);
+        if (taUser != null && taUser.getIsAdmin() != null && taUser.getIsAdmin()) {
+            userId = null;
+        }
+
         IPage<TaQrcode> pg = new Page<>(pageNum, pageSize);
-        responseBean.addSuccess(taQrcodeMapper.listQrCodeByCondition(pg, targetType, targetName, channelId, buildingId, orgId));
+        responseBean.addSuccess(taQrcodeMapper.listQrCodeByCondition(pg, targetType, targetName, channelId, buildingId, userId, orgId, personBuildingList));
         return responseBean;
     }
 
@@ -87,12 +102,21 @@ public class TaQrcodeServiceImpl extends ServiceImpl<TaQrcodeMapper, TaQrcode> i
         // 校验是否已有相同的数据
         QueryWrapper<TaQrcode> qrcodeQueryWrapper = new QueryWrapper<>();
         qrcodeQueryWrapper.eq("org_id", orgId);
-        qrcodeQueryWrapper.eq(StringUtils.isNotBlank(taQrcode.getBuildingId()), "building_id", taQrcode.getBuildingId());
-        qrcodeQueryWrapper.eq(taQrcode.getChannelId() != null, "channel_id", taQrcode.getChannelId());
+        if (StringUtils.isBlank(taQrcode.getBuildingId())) {
+            qrcodeQueryWrapper.isNull("building_id");
+        } else {
+            qrcodeQueryWrapper.eq("building_id", taQrcode.getBuildingId());
+        }
+        if (null == taQrcode.getChannelId()) {
+            qrcodeQueryWrapper.isNull("channel_id");
+        } else {
+            qrcodeQueryWrapper.eq("channel_id", taQrcode.getChannelId());
+        }
         qrcodeQueryWrapper.eq("target_type", taQrcode.getTargetType());
         qrcodeQueryWrapper.eq("target_id", taQrcode.getTargetId());
-        TaQrcode taQrCodeCheck = taQrcodeMapper.selectOne(qrcodeQueryWrapper);
-        if (taQrCodeCheck != null) {
+        qrcodeQueryWrapper.gt("status", CommConstant.STATUS_DELETE);
+        List<TaQrcode> taQrCodeCheckList = taQrcodeMapper.selectList(qrcodeQueryWrapper);
+        if (CollectionUtils.isNotEmpty(taQrCodeCheckList)) {
             responseBean.addError("请勿重复提交");
             return responseBean;
         }
@@ -114,7 +138,7 @@ public class TaQrcodeServiceImpl extends ServiceImpl<TaQrcodeMapper, TaQrcode> i
 
         // 生成二维码
         String paramsStr = WxQrCodeUtils.generateSceneAndPage(taQrcode.getTargetType(), "",
-                taQrcode.getTargetId(), taQrcode.getTargetType(), taQrcode.getChannelId() + "", taQrcode.getQrCodeId() + "", taQrcode.getBuildingId());
+                taQrcode.getTargetId(), taQrcode.getTargetType(), String.valueOf(taQrcode.getChannelId()), String.valueOf(taQrcode.getQrCodeId()), taQrcode.getBuildingId());
         ResponseBean qrCodeResult = iMiniAppService.getQrCode(paramsStr, taMiniapp.getMiniappId());
         if (qrCodeResult != null && ResponseBean.CODE_SUCCESS == qrCodeResult.getCode()) {
             // 更新数据
@@ -189,22 +213,26 @@ public class TaQrcodeServiceImpl extends ServiceImpl<TaQrcodeMapper, TaQrcode> i
 
     @Override
     public void getStatisticRecordExport(Integer type, Integer qrCodeId, Integer orgId, HttpServletResponse response) throws IOException {
-        response.setContentType("application/vnd.ms-excel");
+        response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");
+        String fileName;
         switch (type) {
             case 1:
-                List<QrCodeVisitPersonNum> records = taQrcodeMapper.getVisitPersonsRecordExport(qrCodeId,orgId);
-                response.setHeader("Content-disposition", "attachment;filename=访问人数.xlsx");
+                List<QrCodeVisitPersonNum> records = taQrcodeMapper.getVisitPersonsRecordExport(qrCodeId, orgId);
+                fileName = URLEncoder.encode("访问人数", "UTF-8");
+                response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
                 EasyExcel.write(response.getOutputStream(), QrCodeVisitPersonNum.class).sheet("访问人数").doWrite(records);
                 break;
             case 2:
                 List<QrCodeVisitNum> records2 = taQrcodeMapper.getVisitNumRecordExport(qrCodeId, orgId);
-                response.setHeader("Content-disposition", "attachment;filename=访问次数.xlsx");
+                fileName = URLEncoder.encode("访问次数", "UTF-8");
+                response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
                 EasyExcel.write(response.getOutputStream(), QrCodeVisitNum.class).sheet("访问次数").doWrite(records2);
                 break;
             case 3:
                 List<QrCodeNewPersonNum> records3 = taQrcodeMapper.getNewPersonsRecordExport(qrCodeId, orgId);
-                response.setHeader("Content-disposition", "attachment;filename=新增注册用户.xlsx");
+                fileName = URLEncoder.encode("新增注册用户", "UTF-8");
+                response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
                 EasyExcel.write(response.getOutputStream(), QrCodeNewPersonNum.class).sheet("新增注册用户").doWrite(records3);
                 break;
             default:

src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java

@@ -194,17 +194,26 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         from.setCreateDate(now);
 
         Map<String, Number> checkNum = taRecommendCustomerMapper.checkCustomerBy(orgId, person.getPersonId(), consultBuildingIds, null != building ? building.getBuildingId() : null);
+        // 是否存在小程序客户记录
         boolean hasOrgCust = checkNum.get("orgNum").intValue() > 0;
+        // 是否存在置业绑定的楼盘客户记录
+        boolean hasConsultBuildingCust = checkNum.get("consultBuildingNum").intValue() > 0;
+        // 是否存在置业绑定的楼盘私客记录
         boolean hasConsultCust = checkNum.get("consultNum").intValue() > 0;
+        // 是否存在当前内容楼盘的客户记录
         boolean hasBuildingCust = checkNum.get("buildingNum").intValue() > 0;
 
-        // 控制是否需要插入小程序级别公客
-        boolean inserted = false;
-        // 置业与楼盘是否有关联关系
+        // 置业与内容楼盘是否有关联关系
         boolean builingAssociated = false;
 
-        // 私客
-        if (null != consultant && !hasConsultCust && null != consultBuildings) {
+        // 职业顾问不插入客户表
+        boolean personIsConsultant = CommConstant.PERSON_REALTY_CONSULTANT.equals(person.getPersonType()) ? true : false;
+        if (personIsConsultant) {
+            return result;
+        }
+
+        // 置业项目
+        if (null != consultant && null != consultBuildings && !hasConsultCust) {
             TaBuilding taBuilding = null;
             if (consultBuildingIds.contains(null != building ? building.getBuildingId() : null)) {
                 taBuilding = building;
@@ -213,35 +222,79 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
                 taBuilding = consultBuildings.get(0);
             }
 
-            TaRecommendCustomer customer = copyFromPerosn(person, new TaRecommendCustomer());
-            fillSomeFieldsOfCustomer(customer, recommender, now);
-            customer.setBuildingId(taBuilding.getBuildingId());
-            customer.setBuildingName(taBuilding.getBuildingName());
-            customer.setRealtyConsultant(consultant.getUserId().toString());
-            taRecommendCustomerMapper.insert(customer);
-            result.add(customer);
-            inserted = true;
+            if (hasConsultBuildingCust) {
+                // 如果是项目公客
+                QueryWrapper<TaRecommendCustomer> taRecommendCustomerQueryWrapper = new QueryWrapper<>();
+                taRecommendCustomerQueryWrapper.eq("building_id", taBuilding.getBuildingId());
+                taRecommendCustomerQueryWrapper.gt("status", CommConstant.STATUS_DELETE);
+                taRecommendCustomerQueryWrapper.orderByAsc("create_date");
+                taRecommendCustomerQueryWrapper.last("limit 1");
+                TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectOne(taRecommendCustomerQueryWrapper);
+
+                taRecommendCustomer = copyFromPerosn(person, taRecommendCustomer);
+                taRecommendCustomer.setRealtyConsultant(consultant.getUserId().toString());
+                taRecommendCustomerMapper.updateById(taRecommendCustomer);
+                result.add(taRecommendCustomer);
+            } else {
+                // 如果没有任何置业及置业楼盘相关的数据, 则插入新记录
+                TaRecommendCustomer customer = copyFromPerosn(person, new TaRecommendCustomer());
+                fillSomeFieldsOfCustomer(customer, recommender, now);
+                customer.setBuildingId(taBuilding.getBuildingId());
+                customer.setBuildingName(taBuilding.getBuildingName());
+                customer.setRealtyConsultant(consultant.getUserId().toString());
+                taRecommendCustomerMapper.insert(customer);
+                result.add(customer);
+
+                // 是否首次进入标识
+                Boolean isFirstOrg = hasOrgCust;
+
+                // 如果非小程序公客, 即首次进入
+                if (!isFirstOrg) {
+                    // 如果分享内容的楼盘跟置业楼盘一致
+                    if (builingAssociated) {
+                        isFirstOrg = true;
+                    }
+                } else {
+                    isFirstOrg = false;
+                }
 
-            TaCustomerFrom customerFrom = copyPropertiesFrom(from);
-            customerFrom.setCustomerId(customer.getCustomerId());
-            customerFrom.setSharePersonId(recommender.getPersonId());
-            customerFrom.setSharePersonName(StringUtils.ifNull(recommender.getName(), recommender.getNickname()));
-            customerFrom.setBuildingId(taBuilding.getBuildingId());
-            customerFrom.setBuildingName(taBuilding.getBuildingName());
-            customerFrom.setIsOrgFirst(!hasOrgCust);
-            customerFrom.setIsProjectFirst(true);
-            customerFrom.setCreateDate(now);
-            taCustomerFromMapper.insert(customerFrom);
+                TaCustomerFrom customerFrom = copyPropertiesFrom(from);
+                customerFrom.setCustomerId(customer.getCustomerId());
+                customerFrom.setSharePersonId(recommender.getPersonId());
+                customerFrom.setSharePersonName(StringUtils.ifNull(recommender.getName(), recommender.getNickname()));
+                customerFrom.setBuildingId(taBuilding.getBuildingId());
+                customerFrom.setBuildingName(taBuilding.getBuildingName());
+                customerFrom.setIsOrgFirst(isFirstOrg);
+                customerFrom.setIsProjectFirst(true);
+                customerFrom.setCreateDate(now);
+                taCustomerFromMapper.insert(customerFrom);
+
+                if (isFirstOrg) {
+                    hasOrgCust = true;
+                }
+            }
         }
 
         // 项目公客
         if (null != building && !hasBuildingCust && !builingAssociated) {
+            // 校验客户是否已经是该项目公客
+//            QueryWrapper<TaRecommendCustomer> customerQueryWrapper = new QueryWrapper<>();
+//            customerQueryWrapper.eq("org_id", orgId);
+//            customerQueryWrapper.eq("person_id", person.getPersonId());
+//            customerQueryWrapper.eq("building_id", building.getBuildingId());
+//            customerQueryWrapper.gt("status", CommConstant.STATUS_DELETE);
+//            customerQueryWrapper.orderByAsc("create_date");
+//            customerQueryWrapper.last("limit 1");
+//            TaRecommendCustomer customerCheck = taRecommendCustomerMapper.selectOne(customerQueryWrapper);
+//            if(customerCheck == null){
             TaRecommendCustomer customer = copyFromPerosn(person, new TaRecommendCustomer());
             fillSomeFieldsOfCustomer(customer, recommender, now);
             customer.setBuildingId(building.getBuildingId());
             taRecommendCustomerMapper.insert(customer);
             result.add(customer);
-            inserted = true;
+
+            // 是否首次进入标识
+            Boolean isFirstOrg = hasOrgCust;
 
             TaCustomerFrom customerFrom = copyPropertiesFrom(from);
             customerFrom.setCustomerId(customer.getCustomerId());
@@ -249,14 +302,20 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
             customerFrom.setSharePersonName(null == recommender ? null : StringUtils.ifNull(recommender.getName(), recommender.getNickname()));
             customerFrom.setBuildingId(building.getBuildingId());
             customerFrom.setBuildingName(building.getBuildingName());
-            customerFrom.setIsOrgFirst(!hasOrgCust);
+            customerFrom.setIsOrgFirst(!isFirstOrg);
             customerFrom.setIsProjectFirst(true);
             customerFrom.setCreateDate(now);
             taCustomerFromMapper.insert(customerFrom);
+//            }
+
+            // 如果非小程序公客, 即首次进入
+            if (!isFirstOrg) {
+                hasOrgCust = true;
+            }
         }
 
         // 小程序公客
-        if (!hasOrgCust && !inserted) {
+        if (!hasOrgCust) {
             TaRecommendCustomer customer = copyFromPerosn(person, new TaRecommendCustomer());
             fillSomeFieldsOfCustomer(customer, recommender, now);
             taRecommendCustomerMapper.insert(customer);
@@ -281,7 +340,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         customer.setEntryType(null == recommender ? CommConstant.ENTRY_VOLUNTEER : CommConstant.ENTRY_INPUT);
         customer.setCreateDate(now);
         customer.setReportDate(now);
-        customer.setRecommendPerson(null == recommender ? null : recommender.getPersonId());
+//        customer.setRecommendPerson(null == recommender ? null : recommender.getPersonId());
     }
 
     private TaRecommendCustomer copyFromPerosn(TaPerson person, TaRecommendCustomer cust) {
@@ -305,6 +364,16 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         return to;
     }
 
+    public void delPubCust(String personId, String buildingId) {
+        TaRecommendCustomer recommendCustomer = new TaRecommendCustomer();
+        recommendCustomer.setStatus(CommConstant.STATUS_DELETE);
+
+        QueryWrapper<TaRecommendCustomer> taRecommendCustomerQueryWrapper = new QueryWrapper<>();
+        taRecommendCustomerQueryWrapper.eq("building_id", buildingId);
+        taRecommendCustomerQueryWrapper.eq("person_id", personId);
+        taRecommendCustomerMapper.update(recommendCustomer, taRecommendCustomerQueryWrapper);
+    }
+
     @Override
     public ResponseBean getCustDetail(String id) {
         TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectById(id);

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

@@ -291,7 +291,7 @@ public class ActivityStatisticController extends BaseController {
                                                    @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, buildingId);
+        return taActivityStaticService.selectActivityVisitNum(pageNum, pageSize, getOrgId(request), startDate, endDate, personFrom, province, realtyConsultant, realtyConsultantPhone, activityId, activityType, personId, buildingId, getTaPersonBuildingListByUserId(request));
     }
 
     /**
@@ -339,7 +339,7 @@ public class ActivityStatisticController extends BaseController {
                                                @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, buildingId,  personId);
+        return taActivityStaticService.selectActivityVisitPersonNum(pageNum, pageSize, getOrgId(request), startDate, endDate, personFrom, province, realtyConsultant, realtyConsultantPhone, activityId, activityType, buildingId,  personId, getTaPersonBuildingListByUserId(request));
     }
 
     /**
@@ -364,7 +364,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, activityId, activityType, buildingId,  personId);
+        List<VisitPersonNum> data = taActivityStaticService.selectActivityVisitPersonNumExport(getOrgId(request), startDate, endDate, personFrom, province, realtyConsultant, realtyConsultantPhone, activityId, activityType, buildingId,  personId, getTaPersonBuildingListByUserId(request));
         excelWriter.write(data, writeSheet);
         // finish 会帮忙关闭流
         excelWriter.finish();

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.statistic.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.excel.ActivityStatistics.*;
 import org.apache.ibatis.annotations.Mapper;
@@ -240,7 +241,8 @@ public interface TaActicityStaticMapper {
             @Param("realtyConsultantPhone") String realtyConsultantPhone,
             @Param("activityId") String activityId,
             @Param("activityType") String activityType,
-            @Param("buildingId") String buildingId
+            @Param("buildingId") String buildingId,
+            @Param("taPersonBuildings")List<TaPersonBuilding> taPersonBuildings
     );
 
     List<VisitNum> selectActivityVisitNumExport(
@@ -267,7 +269,8 @@ public interface TaActicityStaticMapper {
             @Param("realtyConsultantPhone") String realtyConsultantPhone,
             @Param("activityId") String activityId,
             @Param("activityType") String activityType,
-            @Param("buildingId") String buildingId
+            @Param("buildingId") String buildingId,
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings
     );
 
     List<VisitPersonNum> selectActivityVisitPersonNumExport(
@@ -280,7 +283,8 @@ public interface TaActicityStaticMapper {
             @Param("realtyConsultantPhone") String realtyConsultantPhone,
             @Param("activityId") String activityId,
             @Param("activityType") String activityType,
-            @Param("buildingId") String buildingId
+            @Param("buildingId") String buildingId,
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings
     );
 
     IPage<VisitPersonNum> selectActivityVisitPersonNumByPersonId(
@@ -291,7 +295,8 @@ public interface TaActicityStaticMapper {
             @Param("personId") String personId,
             @Param("activityId") String activityId,
             @Param("activityType") String activityType,
-            @Param("buildingId") String buildingId
+            @Param("buildingId") String buildingId,
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings
     );
 
     List<VisitPersonNum> selectActivityVisitPersonNumExportByPersonId(
@@ -301,7 +306,8 @@ public interface TaActicityStaticMapper {
             @Param("personId") String personId,
             @Param("activityId") String activityId,
             @Param("activityType") String activityType,
-            @Param("buildingId") String buildingId
+            @Param("buildingId") String buildingId,
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings
     );
 
     IPage<VisitNum> selectActivityVisitNumByPersonId(
@@ -312,7 +318,8 @@ public interface TaActicityStaticMapper {
             @Param("personId") String personId,
             @Param("activityId") String activityId,
             @Param("activityType") String activityType,
-            @Param("buildingId") String buildingId
+            @Param("buildingId") String buildingId,
+            @Param("taPersonBuildings")List<TaPersonBuilding> taPersonBuildings
     );
 
     List<VisitNum> selectActivityVisitNumExportByPersonId(

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.excel.ActivityStatistics.*;
 import com.huiju.estateagents.statistic.mapper.TaActicityStaticMapper;
@@ -151,13 +152,13 @@ public class TaActivityStaticServiceImpl {
         return taActicityStaticMapper.selectActivityAddRegistNumExport(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, activityId, activityType, buildingId, province, taPersonBuildings, userId);
     }
 
-    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){
+    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, List<TaPersonBuilding> taPersonBuildings){
         IPage<VisitNum> iPage = new Page<>(pageNum, pageSize);
         IPage<VisitNum> data;
         if (StringUtils.isEmpty(personId)){
-            data = taActicityStaticMapper.selectActivityVisitNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, provice, realtyConsultant, realtyConsultantPhone, activityId, activityType, buildingId);
+            data = taActicityStaticMapper.selectActivityVisitNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, provice, realtyConsultant, realtyConsultantPhone, activityId, activityType, buildingId, taPersonBuildings);
         }else{
-            data = taActicityStaticMapper.selectActivityVisitNumByPersonId(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personId, activityId, activityType, buildingId);
+            data = taActicityStaticMapper.selectActivityVisitNumByPersonId(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personId, activityId, activityType, buildingId, taPersonBuildings);
         }
 
         return ResponseBean.success(data);
@@ -173,24 +174,48 @@ public class TaActivityStaticServiceImpl {
         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 buildingId, 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,
+                                                     List<TaPersonBuilding> taBuildings){
         IPage<VisitPersonNum> iPage = new Page<>(pageNum, pageSize);
         IPage<VisitPersonNum> data;
         if (StringUtils.isEmpty(personId)){
-            data = taActicityStaticMapper.selectActivityVisitPersonNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, provice, realtyConsultant, realtyConsultantPhone, activityId, activityType, buildingId);
+            data = taActicityStaticMapper.selectActivityVisitPersonNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, provice, realtyConsultant, realtyConsultantPhone, activityId, activityType, buildingId, taBuildings);
         }else{
-            data = taActicityStaticMapper.selectActivityVisitPersonNumByPersonId(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personId, activityId, activityType, buildingId);
+            data = taActicityStaticMapper.selectActivityVisitPersonNumByPersonId(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personId, activityId, activityType, buildingId, taBuildings);
         }
 
         return ResponseBean.success(data);
     }
 
-    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){
+    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<TaPersonBuilding> taBuildings){
         List<VisitPersonNum> list = new ArrayList<>();
         if (StringUtils.isEmpty(personId)){
-            list = taActicityStaticMapper.selectActivityVisitPersonNumExport(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, provice, realtyConsultant, realtyConsultantPhone, activityId, activityType, buildingId);
+            list = taActicityStaticMapper.selectActivityVisitPersonNumExport(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, provice, realtyConsultant, realtyConsultantPhone, activityId, activityType, buildingId, taBuildings);
         }else{
-            list = taActicityStaticMapper.selectActivityVisitPersonNumExportByPersonId(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personId, activityId, activityType, buildingId);
+            list = taActicityStaticMapper.selectActivityVisitPersonNumExportByPersonId(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personId, activityId, activityType, buildingId, taBuildings);
         }
         return list;
     }

src/main/resources/mapper/TaChannelMapper.xml

@@ -70,7 +70,22 @@
 
     <select id="getChannelIntroductionList" resultType="com.huiju.estateagents.entity.TsActivityDaily">
         SELECT
-            *
+            serial_no,
+            statis_date,
+            org_id,
+            building_id,
+            building_name,
+            target_id,
+            target_type,
+            target_name,
+            sum( share_num ) AS share_num,
+            sum( share_persons ) AS share_persons,
+            sum( visit_num ) AS visit_num,
+            sum( visit_persons ) AS visit_persons,
+            sum( new_persons ) AS new_persons,
+            sum( new_customers ) AS new_customers,
+            qr_code_id,
+            channel_id
         FROM
             ts_channel_daily
         WHERE
@@ -85,6 +100,16 @@
         <if test="buildingId != null and buildingId != ''">
             and building_id = #{buildingId}
         </if>
+        <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
+            and building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
+        </if>
+        GROUP BY   target_id, target_type
+        <if test="sortField != null and sortField != ''">
+            ORDER BY ${sortField} ${orderType}
+        </if>
     </select>
     <select id="getChannelNewuserList"
             resultType="com.huiju.estateagents.excel.ActivityStatistics.ChannelAddRegistNum">
@@ -102,8 +127,8 @@
 <!--        LEFT JOIN ta_person e ON t.share_person_id = e.person_id-->
         WHERE t.org_id = #{orgId}
         and t.is_org_first = 1
-<!--        and t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d' ) and t.create_date &lt;= DATE_FORMAT(#{endDate},-->
-<!--        '%Y-%m-%d' )-->
+        and DATE_FORMAT(t.create_date, '%Y-%m-%d' )  >= DATE_FORMAT(#{startDate}, '%Y-%m-%d' ) and DATE_FORMAT(t.create_date, '%Y-%m-%d' ) &lt;= DATE_FORMAT(#{endDate},
+        '%Y-%m-%d' )
         <if test="activityId != null and activityId != ''">
             and t.target_id = #{activityId}
         </if>
@@ -135,19 +160,22 @@
         FROM
         ta_person_visit_record t
         WHERE
-        t.`event` = 'detail'
+        t.`event` in ( 'detail', 'house_list' , 'poster')
         AND t.event_type IN (
         'activity',
         'help',
         'group',
-        'h5'
+        'h5',
+        'news',
+        'building',
+        'live',
+        'house'
         )
         <if test="targetId != null and targetId != ''">
             and t.target_id = #{targetId}
         </if>
         <if test="targetType != null and targetType != ''">
-            and (case when #{targetType} = 'activity' then t.target_type = 'dynamic' when #{targetType} = 'h5' then t.event_type = 'h5' else t.target_type = #{targetType}
-            end)
+            and t.event_type = #{targetType}
         </if>
         <if test="channelId != null and channelId != ''">
             and t.channel_id = #{channelId}
@@ -156,8 +184,8 @@
             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')-->
+        AND DATE_FORMAT(t.visit_time, '%Y-%m-%d' )  >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
+        AND DATE_FORMAT(t.visit_time, '%Y-%m-%d' )  &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')
         ) 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}
@@ -188,22 +216,209 @@
         FROM
         ta_person_visit_record t
         WHERE
-        t.`event` = 'detail'
+        t.`event` in ( 'detail', 'house_list' , 'poster')
+        AND t.event_type IN (
+        'activity',
+        'help',
+        'group',
+        'h5',
+        'news',
+        'building',
+        'live',
+        'house'
+        )
+        AND t.org_id = #{orgId}
+        AND DATE_FORMAT(t.visit_time, '%Y-%m-%d' ) >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
+        AND DATE_FORMAT(t.visit_time, '%Y-%m-%d' ) &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')
+        <if test="targetId != null and targetId != ''">
+            and t.target_id = #{targetId}
+        </if>
+        <if test="targetType != null and targetType != ''">
+            and t.event_type = #{targetType}
+        </if>
+        <if test="buildingId != null and buildingId != ''">
+            and t.building_id = #{buildingId}
+        </if>
+        <if test="channelId != null and channelId != ''">
+            and t.channel_id = #{channelId}
+        </if>
+        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} and b.is_first_time = 1
+        left join td_wx_dict b1 on b.scene_id = b1.scene_id
+        LEFT JOIN ta_recommend_customer c on c.person_id = t.person_id
+        left join ta_user d on c.realty_consultant = d.user_id
+        LEFT JOIN ta_person e ON e.person_id = b.share_person_id
+        group by t.person_id
+        order by t.create_date desc
+    </select>
+    <select id="getChannelIntroductionListExport"
+            resultType="com.huiju.estateagents.excel.ActivityStatistics.TsChannelDaily">
+        SELECT
+        serial_no,
+        statis_date,
+        org_id,
+        building_id,
+        building_name,
+        target_id,
+        target_type,
+        target_name,
+        sum( share_num ) AS share_num,
+        sum( share_persons ) AS share_persons,
+        sum( visit_num ) AS visit_num,
+        sum( visit_persons ) AS visit_persons,
+        sum( new_persons ) AS new_persons,
+        sum( new_customers ) AS new_customers,
+        qr_code_id,
+        channel_id
+        FROM
+        ts_channel_daily
+        WHERE
+        channel_id = #{channelId}
+        AND org_id = #{orgId}
+        <if test="startDate != null and endDate != null">
+            AND statis_date BETWEEN #{startDate} AND #{endDate}
+        </if>
+        <if test="channelType != null and channelType != ''">
+            and target_type = #{channelType}
+        </if>
+        <if test="buildingId != null and buildingId != ''">
+            and building_id = #{buildingId}
+        </if>
+        <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
+            and building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
+        </if>
+        GROUP BY   target_id, target_type
+    </select>
+    <select id="getChannelNewuserListExport"
+            resultType="com.huiju.estateagents.excel.ActivityStatistics.ChannelAddRegistNum">
+        SELECT
+        a.nickname, a.phone,
+        if(a.gender = '1', '男', if(a.gender = '2', '女','未知') ) as gender,
+        a.province,
+        t.create_date
+        FROM ta_customer_from 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} and b.is_first_time =1-->
+        <!--        left join td_wx_dict b1 on b.scene_id = b1.scene_id-->
+        <!--        left join ta_recommend_customer c on c.person_id = t.person_id and c.realty_consultant is not null-->
+        <!--        LEFT JOIN ta_user d ON c.realty_consultant = d.user_id-->
+        <!--        LEFT JOIN ta_person e ON t.share_person_id = e.person_id-->
+        WHERE t.org_id = #{orgId}
+        and t.is_org_first = 1
+                and DATE_FORMAT(t.create_date, '%Y-%m-%d' ) >= DATE_FORMAT(#{startDate}, '%Y-%m-%d' ) and DATE_FORMAT(t.create_date, '%Y-%m-%d' ) &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 = #{activityType}
+        </if>
+        <if test="buildingId != null and buildingId != ''">
+            and t.building_id = #{buildingId}
+        </if>
+        <if test="channelId != null and channelId != ''">
+            and t.channel_id = #{channelId}
+        </if>
+        group by t.person_id order by t.create_date desc
+    </select>
+    <select id="getChannelVisitNumListExport"
+            resultType="com.huiju.estateagents.excel.ActivityStatistics.ChannelVisitNum">
+        select
+        a.nickname, a.phone,
+        if(a.gender = '1', '男', if(a.gender = '2', '女','未知') ) as gender,
+        a.province,
+        b1.scene_alias as personFrom,
+        GROUP_CONCAT(d.user_name) as realtyConsultant,
+        GROUP_CONCAT(d.phone) as realtyConsultantPhone,
+        e.nickname as sharePersonName,
+        e.phone as sharePersonPhone,
+        t.visit_time as visitDate
+        From (
+        SELECT
+        t.person_id, t.visit_time, t.share_person_id
+        FROM
+        ta_person_visit_record t
+        WHERE
+        t.`event` in ( 'detail', 'house_list', 'poster' )
+        AND t.event_type IN (
+        'activity',
+        'help',
+        'group',
+        'h5',
+        'news',
+        'building',
+        'live',
+        'house'
+        )
+        <if test="targetId != null and targetId != ''">
+            and t.target_id = #{targetId}
+        </if>
+        <if test="targetType != null and targetType != ''">
+            and t.event_type = #{targetType}
+        </if>
+        <if test="channelId != null and channelId != ''">
+            and t.channel_id = #{channelId}
+        </if>
+        <if test="buildingId != null and buildingId != ''">
+            and t.building_id = #{buildingId}
+        </if>
+        AND t.org_id = #{orgId}
+        AND DATE_FORMAT( t.visit_time, '%Y-%m-%d' ) >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
+        AND DATE_FORMAT( t.visit_time, '%Y-%m-%d' ) &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')
+        ) 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 ta_recommend_customer c on c.person_id = t.person_id
+        left join ta_user d on c.realty_consultant = d.user_id
+        left join ta_person e on t.share_person_id = e.person_id
+        group by t.visit_time
+        order by t.visit_time desc
+    </select>
+    <select id="getChannelPersonNumListExport"
+            resultType="com.huiju.estateagents.excel.ActivityStatistics.ChannelVisitPersonNum">
+        select
+        a.nickname, a.phone,
+        if(a.gender = '1', '男', if(a.gender = '2', '女','未知') ) as gender,
+        a.province,
+        b1.scene_alias as personFrom,
+        GROUP_CONCAT(d.user_name) as realtyConsultant,
+        GROUP_CONCAT(d.phone) as realtyConsultantPhone,
+        t.create_date as visitDate,
+        e.nickName as sharePersonName,
+        t.visitNum
+        from (
+        SELECT
+        t.visit_time AS create_date,
+        t.person_id,
+        count(*) as visitNum
+        FROM
+        ta_person_visit_record t
+        WHERE
+        t.`event` in ( 'detail', 'house_list', 'poster' )
         AND t.event_type IN (
         'activity',
         'help',
         'group',
-        'h5'
+        'h5',
+        'news',
+        'building',
+        'live',
+        'house'
         )
         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')-->
+        AND DATE_FORMAT( t.visit_time, '%Y-%m-%d' ) >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
+        AND DATE_FORMAT( t.visit_time, '%Y-%m-%d' ) &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')
         <if test="targetId != null and targetId != ''">
             and t.target_id = #{targetId}
         </if>
         <if test="targetType != null and targetType != ''">
-            and (case when #{targetType} = 'activity' then t.target_type = 'dynamic' when #{targetType} = 'h5' then t.event_type = 'h5' else t.target_type = #{targetType}
-            end)
+            and t.event_type = #{targetType}
         </if>
         <if test="buildingId != null and buildingId != ''">
             and t.building_id = #{buildingId}

src/main/resources/mapper/TaLiveActivityMapper.xml

@@ -39,6 +39,9 @@
      </if><if test="buildingId != null and buildingId != ''">
          and t.building_id = #{buildingId}
     </if>
+    <if test="buildingId == null or buildingId == ''">
+        and t.building_id is null
+    </if>
     <if test="personBuildingList != null and personBuildingList.size > 0">
         AND (t.building_id in
         <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">

src/main/resources/mapper/TaQrcodeMapper.xml

@@ -21,11 +21,21 @@
             AND t.target_type = #{targetType}
         </if>
         <if test = "targetName != '' and targetName != null">
-            AND t.target_name = #{targetName}
+            AND t.target_name like concat ('%',#{targetName},'%')
         </if>
         <if test = "channelId != null">
             AND t.channel_id = #{channelId}
         </if>
+        <if test = "userId != null">
+            AND t.create_user = #{userId}
+        </if>
+        <if test="personBuildingList != null and personBuildingList.size > 0">
+            AND (t.building_id in
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                #{personBuilding.buildingId}
+            </foreach>
+                OR t.building_id is null)
+        </if>
       ORDER BY
         t.create_date DESC
     </select>
@@ -37,7 +47,7 @@
             ta_person_visit_record t
         WHERE
             t.org_id = #{orgId}
-            AND t.qrcode_id = #{qrCodeId}
+            AND t.qr_code_id = #{qrCodeId}
     </select>
 
     <select id="getVisitNum" resultType="java.lang.Integer">
@@ -47,7 +57,7 @@
             ta_person_visit_record t
         WHERE
             t.org_id = #{orgId}
-            AND t.qrcode_id = #{qrCodeId}
+            AND t.qr_code_id = #{qrCodeId}
     </select>
 
     <select id="getNewPersons" resultType="java.lang.Integer">
@@ -64,68 +74,77 @@
         SELECT
             t.*,
             IFNULL(t2.`name`,t2.nickname) userName,
-            t2.tel userTel,
-            t2.sex,
-            t2.city,
-            sum(t.record_id) accessCount
+            t2.phone userTel,
+            t2.gender sex,
+            t3.shortname city,
+            count(*) accessCount
         FROM
             ta_person_visit_record t
-            left join ta_person t2
-            on t.person_id = t2.person_id
+            left join ta_person t2 on t.person_id = t2.person_id
+            LEFT JOIN td_city t3 ON t2.city = t3.id
         WHERE
             t.org_id = #{orgId}
-            AND t.qrcode_id = #{qrCodeId}
+            AND t.qr_code_id = #{qrCodeId}
         GROUP BY
 	        t.person_id
+	    ORDER BY
+		    t.visit_time DESC
     </select>
 
     <select id="getVisitPersonsRecordExport" resultType="com.huiju.estateagents.excel.QrCodeStatistics.QrCodeVisitPersonNum">
         SELECT
             IFNULL( t2.`name`, t2.nickname ) nickName,
-            t2.tel phone,
-            t2.sex gender,
-            t2.city province,
-            sum( t.record_id ) visitNum
+            t2.phone phone,
+            (case t2.gender when 1 then '男' when 2 then '女' else '未知' end)  gender,
+            t3.shortname province,
+            count( * ) visitNum
         FROM
             ta_person_visit_record t
             LEFT JOIN ta_person t2 ON t.person_id = t2.person_id
+            LEFT JOIN td_city t3 ON t2.city = t3.id
         WHERE
             t.org_id = #{orgId}
-
-            AND t.qrcode_id = #{qrCodeId}
-
+            AND t.qr_code_id = #{qrCodeId}
         GROUP BY
             t.person_id
+        ORDER BY
+		    t.visit_time DESC
     </select>
 
     <select id="getVisitNumRecord" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
         SELECT
             t.*,
             IFNULL( t2.`name`, t2.nickname ) userName,
-            t2.tel userTel,
-            t2.sex,
-            t2.city
+            t2.phone userTel,
+            t2.gender sex,
+            t3.shortname city
         FROM
             ta_person_visit_record t
             LEFT JOIN ta_person t2 ON t.person_id = t2.person_id
+            LEFT JOIN td_city t3 ON t2.city = t3.id
         WHERE
             t.org_id = #{orgId}
-            AND t.qrcode_id = #{qrCodeId}
+            AND t.qr_code_id = #{qrCodeId}
+        ORDER BY
+            t.visit_time desc
     </select>
 
-    <select id="getVisitPersonsRecordExport" resultType="com.huiju.estateagents.excel.QrCodeStatistics.QrCodeVisitNum">
+    <select id="getVisitNumRecordExport" resultType="com.huiju.estateagents.excel.QrCodeStatistics.QrCodeVisitNum">
         SELECT
             IFNULL( t2.`name`, t2.nickname ) nickName,
-            t2.tel phone,
-            t2.sex gender,
-            t2.city province,
+            t2.phone phone,
+             (case t2.gender when 1 then '男' when 2 then '女' else '未知' end) gender,
+            t3.shortname province,
 			t.visit_time visitTime
         FROM
             ta_person_visit_record t
             LEFT JOIN ta_person t2 ON t.person_id = t2.person_id
+            LEFT JOIN td_city t3 ON t2.city = t3.id
         WHERE
             t.org_id = #{orgId}
-            AND t.qrcode_id = #{qrCodeId}
+            AND t.qr_code_id = #{qrCodeId}
+        ORDER BY
+            t.visit_time desc
     </select>
 
     <select id="getNewPersonsRecord" resultType="com.huiju.estateagents.entity.TaCustomerFrom">
@@ -134,29 +153,41 @@
             t2.`name` userName,
             t2.phone userTel,
             t2.sex,
-            t2.city ,
+            t3.shortname city,
             t2.create_date registerTime
         FROM
             ta_customer_from t
             LEFT JOIN ta_recommend_customer t2 ON t.person_id = t2.person_id
+            LEFT JOIN td_city t3 ON t2.city = t3.id
         WHERE
             t.org_id = #{orgId}
+            AND t.is_org_first =1
             AND t.qr_code_id = #{qrCodeId}
+        GROUP BY
+	        t.customer_id
+	    order by
+	        t2.create_date desc
     </select>
 
     <select id="getNewPersonsRecordExport" resultType="com.huiju.estateagents.excel.QrCodeStatistics.QrCodeNewPersonNum">
         SELECT
             t2.`name` nickName,
-            t2.tel phone,
-            t2.sex gender,
-            t2.city province,
-            t.create_date registerTime
+            t2.phone,
+            (case t2.sex when 1 then '男' when 2 then '女' else '未知' end) gender,
+            t3.shortname province,
+            t2.create_date registerTime
         FROM
             ta_customer_from t
             LEFT JOIN ta_recommend_customer t2 ON t.person_id = t2.person_id
+            LEFT JOIN td_city t3 ON t2.city = t3.id
         WHERE
             t.org_id = #{orgId}
+            AND t.is_org_first =1
             AND t.qr_code_id = #{qrCodeId}
+        GROUP BY
+	        t.customer_id
+	    order by
+	        t2.create_date desc
     </select>
 
 </mapper>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -951,13 +951,26 @@
                 COALESCE(sum( IF ( t.building_id IN ('****')
             </otherwise>
         </choose>
-            , 1, 0 ) ), 0) AS consultNum,
+            , 1, 0 ) ), 0) AS consultBuildingNum,
+
+        <choose>
+            <when test="consultBuildingIds != null and consultBuildingIds.size > 0">
+                COALESCE(sum( IF ( t.building_id IN <foreach collection="consultBuildingIds" item="id" open="(" close=")" separator=",">#{id}</foreach>
+            </when>
+            <otherwise>
+                COALESCE(sum( IF ( t.building_id IN ('****')
+            </otherwise>
+        </choose>
+
+              AND IFNULL(t.realty_consultant, '') != '', 1, 0 ) ), 0) AS consultNum,
 
             COALESCE(sum( IF ( t.building_id = #{buildingId}, 1, 0 ) ), 0) AS buildingNum
+
         FROM
             ta_recommend_customer t
         WHERE
             t.org_id = #{orgId}
             AND t.person_id = #{personId}
+            AND t.status > -1
     </select>
 </mapper>

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

@@ -2081,6 +2081,12 @@
         <if test="buildingId != null and buildingId != ''">
             and t.building_id = #{buildingId}
         </if>
+        <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
+            and t.building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
+        </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')
@@ -2143,6 +2149,12 @@
         <if test="buildingId != null and buildingId != ''">
             and t.building_id = #{buildingId}
         </if>
+        <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
+            and t.building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
+        </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')
@@ -2211,6 +2223,12 @@
         <if test="buildingId != null and buildingId != ''">
             and t.building_id = #{buildingId}
         </if>
+        <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
+            and t.building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
+        </if>
         GROUP BY
         t.person_id ) as t
         left join ta_person a on t.person_id = a.person_id

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

@@ -50,8 +50,7 @@
         select ifnull(tp.from_num, 0) as from_num , ifnull(tp.registered_num, 0) AS registered_num , ifnull(tp.create_time, date.date) AS create_time, ifnull(tp.scene_type, 'other') as scene_type from (
 
         SELECT
-        DATE_FORMAT(
-        DATE_ADD( STR_TO_DATE(#{startDate}, '%Y-%m-%d' ), INTERVAL rownum DAY ), '%Y-%m-%d' ) AS date
+        DATE_FORMAT( DATE_SUB( now( ), INTERVAL rownum DAY ), '%Y-%m-%d' ) AS date
         FROM sequence
         WHERE rownum < DATEDIFF(STR_TO_DATE( #{endDate}, '%Y-%m-%d' ), STR_TO_DATE( #{startDate}, '%Y-%m-%d' )) ) as date
 
@@ -73,8 +72,7 @@
         select ifnull(tp.from_num, 0) as from_num , ifnull(tp.registered_num, 0) AS registered_num , ifnull(tp.create_time, date.date) AS create_time, ifnull(tp.scene_type, 'other') as scene_type from (
 
         SELECT
-        DATE_FORMAT(
-        DATE_ADD( STR_TO_DATE(#{startDate}, '%Y-%m-%d' ), INTERVAL rownum DAY ), '%Y-%m-%d' ) AS date
+        DATE_FORMAT( DATE_SUB( now( ), INTERVAL rownum DAY ), '%Y-%m-%d' ) AS date
         FROM sequence
         WHERE rownum < DATEDIFF(STR_TO_DATE( #{endDate}, '%Y-%m-%d' ), STR_TO_DATE( #{startDate}, '%Y-%m-%d' )) ) as date
 
@@ -99,5 +97,6 @@
         DATE_FORMAT( tp.create_date, '%Y-%m-%d' )
         ORDER BY tp.create_date
         ) as tp on date.date = tp.create_time
+        order by date.date
     </select>
 </mapper>

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

@@ -62,7 +62,7 @@
             td_biz_event_type b
             <trim prefix="where">
                 <if test="startDate != null or endDate != null">
-                    a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
+                    a.rownum <![CDATA[ < ]]> datediff(#{endDate}, #{startDate})
                 </if>
             </trim>
         ) AS temp_date