Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/huiju/estateagents/base/BaseController.java

@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
+import java.util.Enumeration;
 import java.util.List;
 import java.util.Map;
 
@@ -140,3 +141,4 @@ public class BaseController {
         return taPersonBuildingList;
     }
 }
+

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

@@ -252,7 +252,7 @@ public class ExtendContentController extends BaseController {
             //一个城市只能有一个开屏广告
             boolean existFlag = iExtendContentService.advertistExistFlag(extendContent, getOrgId(request));
             if (!existFlag){
-                responseBean.addError("该城市已有开屏广告，请勿再次上架");
+                responseBean.addError("该发布位置已有开屏广告，请勿再次上架");
                 return responseBean;
             }
 

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

@@ -12,6 +12,7 @@ import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.drainage.entity.TaDrainage;
 import com.huiju.estateagents.drainage.service.ITaDrainageService;
 import com.huiju.estateagents.entity.*;
@@ -22,7 +23,6 @@ import com.huiju.estateagents.service.*;
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
 import me.chanjar.weixin.common.error.WxErrorException;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -194,10 +194,10 @@ public class MiniAppController extends BaseController {
             HttpServletRequest request) {
         String appid = request.getHeader("appid");
 
-        if (StringUtils.isBlank(code)) {
+        if (StringUtils.isEmpty(code)) {
             return ResponseBean.error("参数 code 不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
-        if (StringUtils.isBlank(appid)) {
+        if (StringUtils.isEmpty(appid)) {
             return ResponseBean.error("Header 参数 appid 不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
@@ -254,8 +254,8 @@ public class MiniAppController extends BaseController {
             // 增加积分线程 --- 3.5.23版本授权手机分享者增加积分，单纯分享不增加积分
 //            ExecutorService threadPool = Executors.newCachedThreadPool();
 //            threadPool.execute(() -> {
-////                if (null != from && from.contains("share") && !com.huiju.estateagents.common.StringUtils.isEmpty(recommender) && count > 0) {
-//                if (null != from && from.contains("share") && !com.huiju.estateagents.common.StringUtils.isEmpty(recommender)) {
+////                if (null != from && from.contains("share") && !StringUtils.isEmpty(recommender) && count > 0) {
+//                if (null != from && from.contains("share") && !StringUtils.isEmpty(recommender)) {
 //                    // 校验是否点击过此人的分享
 //                    boolean checkPoint = checkSharePersonFrom(from, taPerson.getPersonId(), targetId, orgId);
 //                    if (checkPoint) {
@@ -265,7 +265,7 @@ public class MiniAppController extends BaseController {
 //                }
 //            });
 
-            if (StringUtils.isNotBlank(from) && StringUtils.isNotBlank(recommender) && StringUtils.isNotBlank(targetId)) {
+            if (!StringUtils.isEmpty(from) && !StringUtils.isEmpty(recommender) && !StringUtils.isEmpty(targetId)) {
                 TaSharePersonFrom taSharePersonFrom = new TaSharePersonFrom();
                 TaPerson recommenderPerson = taPersonService.getById(recommender);
                 taSharePersonFrom.setCreateDate(LocalDateTime.now());
@@ -486,7 +486,7 @@ public class MiniAppController extends BaseController {
     /**
      * 获取用户绑定手机号信息
      */
-    @PostMapping("/userPhone")
+    @PostMapping("Phone")
     public ResponseBean phone(@RequestBody String paramStr, HttpServletRequest request) {
         String appid = request.getHeader("appid");
         JSONObject params = JSONObject.parseObject(paramStr);
@@ -502,19 +502,25 @@ public class MiniAppController extends BaseController {
         // 楼盘ID
         String buildingId = params.getString("buildingId");
         // 场景ID
-        String sceneId = params.getString("sceneId");
+        String sceneId = StringUtils.ifNull(params.getString("sceneId"), request.getHeader("x-sceneId"));
         // 访问目标
-        String targetType = params.getString("targetType");
+        String targetType = StringUtils.ifNull(params.getString("targetType"), request.getHeader("x-targetType"));
         // 目标ID
-        String targetId = params.getString("targetId");
+        String targetId = StringUtils.ifNull(params.getString("targetId"), request.getHeader("x-targetId"));
         // 目标名称
-        String targetName = params.getString("targetName");
+        String targetName = StringUtils.ifNull(params.getString("targetName"), request.getHeader("x-targetName"));
         // 推广用户
-        String promoter = params.getString("promoter");
+        String promoter = StringUtils.ifNull(params.getString("promoter"), request.getHeader("x-recommender"));
+        // 置业顾问
+        String consultantPersonId = request.getHeader("x-consultant");
+        // 渠道ID
+        String channelId = params.getString("channelId");
+        // 推广码ID
+        String qrCodeId = params.getString("qrCodeId");
 
         // 解密
         WxMaPhoneNumberInfo phoneNoInfo = miniAppService.getPhoneNoInfo(sessionKey, encryptedData, iv, appid);
-        if (null == phoneNoInfo || com.huiju.estateagents.common.StringUtils.isEmpty(phoneNoInfo.getPhoneNumber())) {
+        if (null == phoneNoInfo || StringUtils.isEmpty(phoneNoInfo.getPhoneNumber())) {
             ResponseBean.error("解析用户手机号码出错", ResponseBean.ERROR_UNAVAILABLE);
         }
 
@@ -522,17 +528,28 @@ public class MiniAppController extends BaseController {
         Integer orgId = getOrgId(request);
         String phone = phoneNoInfo.getPhoneNumber();
 
+        TaCustomerFrom customerFrom = new TaCustomerFrom();
+        customerFrom.setTargetType(targetType);
+        customerFrom.setTargetId(targetId);
+        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));
+        }
+
         try {
             taPersonService.authPhone(
                     orgId,
                     openid,
                     phone,
                     buildingId,
-                    sceneId,
-                    targetType,
-                    targetId,
-                    targetName,
-                    promoter);
+                    promoter,
+                    consultantPersonId,
+                    customerFrom);
 
             return ResponseBean.success(phoneNoInfo);
         } catch (Exception e) {

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;
@@ -308,4 +315,94 @@ public class TaChannelController extends BaseController {
                                         HttpServletRequest request) {
         return taChannelService.getPersonNumList(pageNum, pageSize, getOrgId(request), channelId, targetId, targetType, buildingId);
     }
+
+    /**
+     * 渠道引进客户统计导出
+     * @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 = "channelType", required = false)String channelType,
+                                                         @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, channelType, buildingId, channelId);
+        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,
+                                       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);
+        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,
+                                        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);
+        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,
+                                         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);
+        excelWriter.write(data, writeSheet);
+        // finish 会帮忙关闭流
+        excelWriter.finish();
+    }
 }

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

@@ -783,4 +783,9 @@ public class TaPersonController extends BaseController {
         return responseBean;
     }
 
+    @PutMapping("/wx/userInfo/updatePhoto")
+    public ResponseBean updateUserPhoto(String photoUrl, HttpServletRequest request){
+        String openId = getOpenId(request);
+        return taPersonService.updateUserPhoto(photoUrl, openId);
+    }
 }

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

@@ -351,4 +351,7 @@ public class TaBuilding implements Serializable {
 
     @TableField(exist = false)
     private List<TaSalesBatch> salesBatch;
+
+    @TableField(exist = false)
+    private List<ExtendContent> extendContent;
 }

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

@@ -140,4 +140,13 @@ public class TaCustomerFrom implements Serializable {
     @TableField(exist = false)
     private LocalDateTime registerTime;
 
+    /**
+     * 渠道 ID
+     */
+    private Integer channelId;
+
+    /**
+     * 推广码ID
+     */
+    private Integer qrCodeId;
 }

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

@@ -330,4 +330,14 @@ public class TaPerson implements Serializable {
      */
     @TableField(exist = false)
     private String targetName;
+
+    /**
+     * 渠道 ID
+     */
+    private Integer channelId;
+
+    /**
+     * 推广码ID
+     */
+    private Integer qrCodeId;
 }

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/mapper/TaChannelMapper.java

@@ -7,6 +7,7 @@ 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;
 
@@ -62,4 +63,12 @@ public interface TaChannelMapper extends BaseMapper<TaChannel> {
     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<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);
+
+    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);
+
+    List<ChannelAddRegistNum> getChannelNewuserListExport( @Param("orgId") Integer orgId, @Param("channelId") Integer channelId, @Param("activityId") String activityId, @Param("activityType") String activityType, @Param("buildingId") String buildingId);
+
+    List<ChannelVisitNum> getChannelVisitNumListExport(@Param("orgId") Integer orgId,@Param("channelId") Integer channelId,@Param("targetId") String targetId,@Param("targetType") String targetType,@Param("buildingId") String buildingId);
+
+    List<ChannelVisitPersonNum> getChannelPersonNumListExport(@Param("orgId") Integer orgId,@Param("channelId") Integer channelId,@Param("targetId") String targetId,@Param("targetType") String targetType,@Param("buildingId") String buildingId);
 }

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

@@ -4,6 +4,7 @@ import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.entity.TaCustomerFrom;
 import com.huiju.estateagents.entity.TaPerson;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.entity.TaPersonBuilding;
@@ -115,9 +116,9 @@ public interface ITaPersonService extends IService<TaPerson> {
                    String openid,
                    String phone,
                    String buildingId,
-                   String sceneId,
-                   String targetType,
-                   String targetId,
-                   String targetName,
-                   String promoter) throws Exception;
+                   String promoter,
+                   String consultantPersonId,
+                   TaCustomerFrom customerFrom) throws Exception;
+
+    ResponseBean updateUserPhoto(String photoUrl, String openId);
 }

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

@@ -1,9 +1,15 @@
 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.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>
@@ -66,4 +72,49 @@ public interface TaChannelService extends IService<TaChannel> {
      * @return
      */
     ResponseBean getPersonNumList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId);
+
+    /**
+     * 导出
+     * @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);
+
+    /**
+     * 导出
+     * @param orgId
+     * @param channelId
+     * @param targetId
+     * @param targetType
+     * @param buildingId
+     * @return
+     */
+    List<ChannelAddRegistNum> getNewuserListExport(Integer orgId, Integer channelId, String targetId, String targetType, String buildingId);
+
+    /**
+     * 导出
+     * @param orgId
+     * @param channelId
+     * @param targetId
+     * @param targetType
+     * @param buildingId
+     * @return
+     */
+    List<ChannelVisitNum> getVisitNumListExport(Integer orgId, Integer channelId, String targetId, String targetType, String buildingId);
+
+    /**
+     * 导出
+     * @param orgId
+     * @param channelId
+     * @param targetId
+     * @param targetType
+     * @param buildingId
+     * @return
+     */
+    List<ChannelVisitPersonNum> getPersonNumListExport(Integer orgId, Integer channelId, String targetId, String targetType, String buildingId);
 }

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

@@ -123,6 +123,9 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Autowired
     private ITaRaiseInviteService iTaRaiseInviteService;
 
+    @Autowired
+    private IExtendContentService iExtendContentService;
+
     @Override
     public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId, List<TaPersonBuilding> taPersonBuildingList) {
         Page<TaBuilding> page = new Page<>();
@@ -227,7 +230,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     }
 
     @Override
-    public ResponseBean buildingAllSelectId(String id, TaPerson person, Integer orgId) {
+    public ResponseBean      buildingAllSelectId(String id, TaPerson person, Integer orgId) {
         // 查询基础信息
         QueryWrapper<TaBuilding> buildingtWrapper = new QueryWrapper<>();
         buildingtWrapper.lambda().gt(TaBuilding::getStatus, -1);
@@ -343,6 +346,17 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         salesBatchQueryWrapper.lambda().eq(TaSalesBatch::getStatus, CommConstant.STATUS_NORMAL);
         List<TaSalesBatch> taSalesBatch = iTaSalesBatchService.list(salesBatchQueryWrapper);
 
+        // 查询关联项目的开屏广告
+        QueryWrapper<ExtendContent> taExtendContentQueryWrapper = new QueryWrapper<>();
+        taExtendContentQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+        taExtendContentQueryWrapper.eq("building_id", id);
+        taExtendContentQueryWrapper.eq("org_id", orgId);
+        taExtendContentQueryWrapper.eq("show_type", CommConstant.OPEN_SCREEN);
+        taExtendContentQueryWrapper.eq("show_position", CommConstant.BANNER_BUILDING);
+        List<ExtendContent> taExtendContents = iExtendContentService.list(taExtendContentQueryWrapper);
+        building.setExtendContent(taExtendContents);
+
+
         List<TaSalesBatch> resultSalesBatchList = new ArrayList<>();
         taSalesBatch.stream().forEach(record -> {
             // 查询批次下认筹是否开启邀请制

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

@@ -6,16 +6,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaChannel;
 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.*;
 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>
@@ -106,4 +104,65 @@ public class TaChannelServiceImpl extends ServiceImpl<TaChannelMapper, TaChannel
         IPage<ChannelVisitPersonNum> data = taChannelMapper.getChannelPersonNumList(iPage, orgId, channelId, targetId, targetType, buildingId);
         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) {
+        return taChannelMapper.getChannelIntroductionListExport(orgId,startDate,endDate,channelType,buildingId, channelId);
+    }
+
+    /**
+     * 导出
+     *
+     * @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) {
+        return taChannelMapper.getChannelNewuserListExport(orgId, channelId, targetId,targetType, buildingId);
+    }
+
+    /**
+     * 导出
+     *
+     * @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) {
+        return taChannelMapper.getChannelVisitNumListExport(orgId, channelId, targetId, targetType, buildingId);
+    }
+
+    /**
+     * 导出
+     *
+     * @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) {
+        return taChannelMapper.getChannelPersonNumListExport(orgId, channelId, targetId, targetType, buildingId);
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.service.impl;
 
+import ch.qos.logback.core.pattern.util.RegularEscapeUtil;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -880,66 +881,76 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
      * @param openid
      * @param phone
      * @param buildingId
-     * @param sceneId
-     * @param targetType
-     * @param targetId
-     * @param targetName
      * @param promoter
+     * @param customerFrom
      * @throws Exception
      */
     @Override
-    public void authPhone(Integer orgId, String openid, String phone, String buildingId, String sceneId, String targetType, String targetId, String targetName, String promoter) throws Exception {
-        log.info("orgId={},openid={},phone={},buildingId={},sceneId={},targetType={},targetId={},targetName={},promoter={}",
-                orgId,openid,phone,buildingId,sceneId,targetType,targetId,targetName,promoter);
+    public void authPhone(Integer orgId,
+                          String openid,
+                          String phone,
+                          String buildingId,
+                          String promoter,
+                          String consultantPersonId,
+                          TaCustomerFrom customerFrom) throws Exception {
+        log.info("orgId={},openid={},phone={},buildingId={},promoter={}, customerFrom={}",
+                orgId,openid,phone,buildingId,promoter, JSONObject.toJSONString(customerFrom));
         //
         LocalDateTime now = LocalDateTime.now();
 
-        // 更新人员手机号
+        // 当前人员
         List<TaPerson> persons = getPersonsByOpenId(openid);
         if (null == persons || persons.size() != 1) {
             throw new Exception("当前人员 openid 异常");
         }
         TaPerson person = persons.get(0);
+        // 更新手机号
         person.setPhone(phone);
+        // 更新授权时间
         person.setAuthPhoneTime(now);
         if (StringUtils.isEmpty(person.getBuildingId())) {
+            // 更新楼盘
             person.setBuildingId(buildingId);
         }
         if (CommConstant.PERSON_ESTATE_DRIFT.equals(person.getPersonType())) {
+            // 更新人员身份
             person.setPersonType(CommConstant.PERSON_ESTATE_CUSTOMER);
         }
+        if (null != customerFrom.getChannelId() && null == person.getChannelId()) {
+            // 更新渠道
+            person.setChannelId(customerFrom.getChannelId());
+        }
+        if (null != customerFrom.getQrCodeId() && null == person.getQrCodeId()) {
+            // 更新推广码
+            person.setQrCodeId(customerFrom.getQrCodeId());
+        }
         updateById(person);
 
         // 关联推荐客户
         fixCustomerPersonId(person);
 
         // 客户来源
-        TaCustomerFrom customerFrom = new TaCustomerFrom();
         customerFrom.setPersonId(person.getPersonId());
         customerFrom.setPersonName(StringUtils.ifNull(person.getName(), person.getNickname()));
-        customerFrom.setTargetType(targetType);
-        customerFrom.setTargetId(targetId);
-        customerFrom.setTargetName(targetName);
-        customerFrom.setOrgId(orgId);
-        customerFrom.setSceneId(sceneId);
         customerFrom.setCreateDate(now);
 
         // 推广人
         TaPerson recPerson = StringUtils.isEmpty(promoter) ? null : taPersonMapper.getById(promoter);
         // 推荐楼盘
         TaBuilding building = StringUtils.isEmpty(buildingId) ? null : taBuildingMapper.selectById(buildingId);
-        // 是否置业顾问
+        // 置业顾问
         boolean isConsultant = null != recPerson && CommConstant.PERSON_REALTY_CONSULTANT.equals(recPerson.getPersonType());
+        TaPerson consultant = null != consultantPersonId ? getById(consultantPersonId) : (isConsultant ? recPerson : null);
 
         try {
-            List<TaRecommendCustomer> customerList = iTaRecommendCustomerService.newCustomer(orgId, person, recPerson, isConsultant ? recPerson : null, building, customerFrom);
+            List<TaRecommendCustomer> customerList = iTaRecommendCustomerService.newCustomer(orgId, person, recPerson, consultant, building, customerFrom);
             if (customerList.size() > 0) {
                 // 发放积分
                 applicationContext.publishEvent(new EventBus(person, EventBus.EventType.SignUpAgent, orgId));
 
                 //授权手机给推广人加积分
                 String sharePersonId = getSharePersonFrom(person);
-                if (validateSceneId(sceneId) && !StringUtils.isEmpty(sharePersonId)){
+                if (validateSceneId(customerFrom.getSceneId()) && !StringUtils.isEmpty(sharePersonId)){
                     applicationContext.publishEvent(new EventBus(promoter != null ? promoter : sharePersonId, EventBus.EventType.SharePosterAll, orgId));
                 }
             }
@@ -1255,4 +1266,22 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     }
 
 
+    @Override
+    public ResponseBean updateUserPhoto(String photoUrl, String openId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        List<TaPerson> taPersons = getPersonsByOpenId(openId);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        TaPerson taPerson = taPersons.get(0);
+        TaUser taUser = new TaUser();
+        taUser.setUserId(taPerson.getUserId());
+        taUser.setPhoto(photoUrl);
+
+        taUserMapper.updateById(taUser);
+        responseBean.addSuccess("修改成功");
+        return responseBean;
+    }
 }

src/main/resources/mapper/TaChannelMapper.xml

@@ -222,5 +222,161 @@
         group by t.person_id
         order by t.create_date desc
     </select>
+    <select id="getChannelIntroductionListExport"
+            resultType="com.huiju.estateagents.excel.ActivityStatistics.TsChannelDaily">
+        SELECT
+        *
+        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>
+    </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 t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d' ) and t.create_date &lt;= DATE_FORMAT(#{endDate},-->
+        <!--        '%Y-%m-%d' )-->
+        <if test="activityId != null and activityId != ''">
+            and t.target_id = #{activityId}
+        </if>
+        <if test="activityType != null and activityType != ''">
+            and t.target_type = #{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` = 'detail'
+        AND t.event_type IN (
+        'activity',
+        'help',
+        'group',
+        'h5'
+        )
+        <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)
+        </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 t.visit_time >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')-->
+        <!--        AND t.visit_time &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` = 'detail'
+        AND t.event_type IN (
+        'activity',
+        'help',
+        'group',
+        'h5'
+        )
+        AND t.org_id = #{orgId}
+        <!--        AND t.visit_time >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')-->
+        <!--        AND t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')-->
+        <if test="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)
+        </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>
 
 </mapper>

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

@@ -47,29 +47,38 @@
     </select>
     <select id="selectPersonFromGroupByData"
             resultType="com.huiju.estateagents.statistic.entity.TsPersonFromStatistic">
+        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
-        sum( tp.from_num ) AS from_num,
-        sum( tp.registered_num ) AS registered_num,
-        DATE_FORMAT( tp.create_date, '%Y-%m-%d' ) AS create_time,
-        tp.scene_type
-        FROM
-        ts_person_from_statistic tp
-        WHERE
-        tp.org_id = #{orgId}
+        DATE_FORMAT(
+        DATE_ADD( STR_TO_DATE(#{startDate}, '%Y-%m-%d' ), INTERVAL rownum DAY ), '%Y-%m-%d' ) AS date
+        FROM sequence
+        WHERE rownum &lt; DATEDIFF(STR_TO_DATE( #{endDate}, '%Y-%m-%d' ), STR_TO_DATE( #{startDate}, '%Y-%m-%d' )) ) as date
+
+        left join (SELECT sum( tp.from_num ) AS from_num, sum( tp.registered_num ) AS registered_num, DATE_FORMAT( tp.create_date, '%Y-%m-%d' ) AS create_time, tp.scene_type
+        FROM ts_person_from_statistic tp
+        WHERE tp.org_id = #{orgId}
         <if test="startDate != null or endDate != null">
             AND  DATE_FORMAT( tp.create_date, '%Y-%m-%d' ) BETWEEN #{startDate} and #{endDate}
         </if>
         <if test="startDate == null or endDate == null">
             AND DATE_FORMAT( tp.create_date, '%Y-%m-%d' ) BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
-        GROUP BY
-        DATE_FORMAT( tp.create_date, '%Y-%m-%d' ),
-        tp.scene_type
-        ORDER BY tp.create_date
+        GROUP BY DATE_FORMAT( tp.create_date, '%Y-%m-%d' ), tp.scene_type ORDER BY tp.create_date
+        ) as tp on date.date = tp.create_time
+
     </select>
     <select id="selectNewLinePersonFromGroupByData"
             resultType="com.huiju.estateagents.statistic.entity.TsPersonFromStatistic">
+        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
+        FROM sequence
+        WHERE rownum &lt; DATEDIFF(STR_TO_DATE( #{endDate}, '%Y-%m-%d' ), STR_TO_DATE( #{startDate}, '%Y-%m-%d' )) ) as date
+
+        left join (SELECT
         sum( tp.from_num ) AS from_num,
         sum( tp.registered_num ) AS registered_num,
         DATE_FORMAT( tp.create_date, '%Y-%m-%d' ) AS create_time,
@@ -89,5 +98,6 @@
         GROUP BY
         DATE_FORMAT( tp.create_date, '%Y-%m-%d' )
         ORDER BY tp.create_date
+        ) as tp on date.date = tp.create_time
     </select>
 </mapper>