合并

pom.xml

@@ -198,7 +198,7 @@
 				<includes>
 					<include>application.yml</include>
 					<include>application-${profiles.active}.yml</include>
-					<include>mapper/*.xml</include>
+					<include>mapper/**/*.xml</include>
 				</includes>
 			</resource>
 		</resources>

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -457,4 +457,19 @@ public class CommConstant {
      * 活动以结束
      */
     public static final Integer ACTIVITY_STATUS_FINISH = 2;
+    
+    /**
+     * 客户统计类型：跟进客户
+     */
+	public static final String CUSTOMER_TYPE_FOLLOW = "follow";
+    
+    /**
+     * 客户统计类型：新增客户
+     */
+    public static final String CUSTOMER_TYPE_NEW = "new";
+    
+    /**
+     * 客户统计类型：到访客户
+     */
+    public static final String CUSTOMER_TYPE_VISITE = "visite";
 }

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

@@ -102,7 +102,7 @@ public class TaPolicyController extends BaseController {
     @RequestMapping(value="/wx/taPolicy",method= RequestMethod.GET)
     public ResponseBean taPolicyListCity(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                         @RequestParam(value ="cityId", required = false) Integer cityId){
+                                         @RequestParam(value ="cityId", required = false) Integer cityId,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
@@ -110,6 +110,7 @@ public class TaPolicyController extends BaseController {
             QueryWrapper<TaPolicy> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("city_id",cityId);
             queryWrapper.eq("publish_status",CommConstant.IS_PUBLISH);
+            queryWrapper.eq("org_id",getOrgId(request));
             queryWrapper.orderByDesc("weight", "create_date");
             queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
 

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

@@ -115,7 +115,12 @@ public class HelpActivity implements Serializable {
      * 活动状态
      */
     private Integer activityStatus;
-    
+
+    /**
+     * 权重，用于排序
+     */
+    private Integer heavy;
+
     /**
      * Initiate 发起者  Booster 助力者
      */

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

@@ -188,6 +188,16 @@ public class TaBuilding implements Serializable {
      */
     private Integer orgId;
 
+    /**
+     * 视频url
+     */
+    private String videoUrl;
+
+    /**
+     * 地图范围
+     */
+    private Integer mapScope;
+
 
 
     /**
@@ -249,4 +259,10 @@ public class TaBuilding implements Serializable {
      */
     @TableField(exist = false)
     private List<TaShareActivity> shareActivityList;
+
+    /**
+     * 列表图
+     */
+    @TableField(exist = false)
+    private List<TaBuildingImg> buildingListImg;
 }

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

@@ -188,6 +188,11 @@ public class TaBuildingDynamic implements Serializable {
      */
     private Integer activityStatus;
 
+    /**
+     * 权重，用于排序
+     */
+    private Integer heavy;
+
     /**
      * 公司Id
      */

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

@@ -86,6 +86,11 @@ public class TaShareRecord implements Serializable {
      */
     private Integer verificationStatus;
 
+    /**
+     * 权重，用于排序
+     */
+    private Integer heavy;
+
     /**
      * 核销码
      */

src/main/java/com/huiju/estateagents/job/CustomerStatisticTimeJob.java

@@ -0,0 +1,72 @@
+package com.huiju.estateagents.job;
+
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.common.DateUtils;
+import com.huiju.estateagents.service.IHelpActivityService;
+import com.huiju.estateagents.service.IHelpInitiateRecordService;
+import com.huiju.estateagents.service.IHelpRecordService;
+import com.huiju.estateagents.service.ITaBuildingDynamicService;
+import com.huiju.estateagents.service.ITaShareActivityService;
+import com.huiju.estateagents.service.ITaShareChildRecordService;
+import com.huiju.estateagents.service.ITaShareRecordService;
+import com.huiju.estateagents.statistic.service.ITaCustomerGenderStatisticService;
+import com.huiju.estateagents.statistic.service.ITaCustomerStatisticDailyService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author fxf
+ * @Title: CustomerStatisticTimeJob
+ * @Description: 盘客数据分析统计
+ * @date 2019/11/08
+ */
+@Component
+@Configuration
+@EnableScheduling
+public class CustomerStatisticTimeJob extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(CustomerStatisticTimeJob.class);
+
+    @Autowired
+    private ITaCustomerStatisticDailyService customerStatisticDailyService;
+    
+    @Autowired
+    private ITaCustomerGenderStatisticService taCustomerGenderStatisticService;
+
+    /**
+     *
+     * 盘客工具数据统计
+     *
+     * 开启定时任务，每天23:50执行
+     */
+    @Scheduled(cron = "* 50 23 * * ?")
+    private void configureTasks() {
+        LocalDateTime nowDate = LocalDateTime.now();
+    
+        //每天的新增客户统计并入表
+        customerStatisticDailyService.newCustomerStatisticDaily(nowDate);
+        
+        //每天的跟进客户统计并入表
+        customerStatisticDailyService.followUpStatisticDaily(nowDate);
+        
+        //每天的到访客户统计并入表
+        customerStatisticDailyService.visiteStatisticDaily(nowDate);
+    
+        //每天的新增客户性别统计并入表
+        taCustomerGenderStatisticService.newCustomerSexStatisticDaily(nowDate);
+    
+        //每天的跟进客户性别统计并入表
+        taCustomerGenderStatisticService.followUpSexStatisticDaily(nowDate);
+    
+        //每天的到访客户性别统计并入表
+        taCustomerGenderStatisticService.visiteSexStatisticDaily(nowDate);
+    }
+
+}

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

@@ -135,6 +135,14 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         List<TaBuildingImg> buildingImg = taBuildingImgMapper.selectList(BuildingImgQueryWrapper);
         building.setBuildingImg(buildingImg);
 
+        // 列表图
+        QueryWrapper<TaBuildingImg> BuildingListImgQueryWrapper = new QueryWrapper<>();
+        BuildingListImgQueryWrapper.eq("building_id", building.getBuildingId());
+        BuildingListImgQueryWrapper.eq("img_type", "list");
+        List<TaBuildingImg> buildingListImg = taBuildingImgMapper.selectList(BuildingListImgQueryWrapper);
+        building.setBuildingListImg(buildingListImg);
+
+
         // 查询tag
         QueryWrapper<TaBuildingTag> BuildingTagQueryWrapper = new QueryWrapper<>();
         BuildingTagQueryWrapper.eq("building_id", id);
@@ -258,6 +266,17 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             insertImgBatch(buildingImgs, building.getBuildingId());
         }
 
+        // 列表图
+        String listImg = object.getString("listImg");
+        List<TaBuildingImg> buildingListImg = JSONObject.parseArray(listImg, TaBuildingImg.class);
+        if (CollectionUtils.isNotEmpty(buildingListImg)) {
+            QueryWrapper<TaBuildingImg> BuildingListImgQueryWrapper = new QueryWrapper<>();
+            BuildingListImgQueryWrapper.eq("building_id", building.getBuildingId());
+            BuildingListImgQueryWrapper.eq("img_type", "list");
+            taBuildingImgMapper.delete(BuildingListImgQueryWrapper);
+            buildingListImg = insertImgBatch(buildingListImg, building.getBuildingId());
+        }
+
 
         // tag先删除再增加
         String tagStr = object.getString("tag");
@@ -321,13 +340,21 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             tdCityMapper.updateById(city);
         }
 
+        // 项目主图
         String imgStr = object.getString("img");
         List<TaBuildingImg> buildingImgs = JSONObject.parseArray(imgStr, TaBuildingImg.class);
-
         if (CollectionUtils.isNotEmpty(buildingImgs)) {
             buildingImgs = insertImgBatch(buildingImgs, building.getBuildingId());
         }
 
+        // 列表图
+        String listImg = object.getString("listImg");
+        List<TaBuildingImg> buildingListImg = JSONObject.parseArray(listImg, TaBuildingImg.class);
+        if (CollectionUtils.isNotEmpty(buildingListImg)) {
+            buildingListImg = insertImgBatch(buildingListImg, building.getBuildingId());
+        }
+
+        // 标签
         String tagStr = object.getString("tag");
         List<TaBuildingTag> buildingTags = JSONObject.parseArray(tagStr, TaBuildingTag.class);
         if (CollectionUtils.isNotEmpty(buildingTags)) {

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

@@ -18,6 +18,7 @@ import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
@@ -28,6 +29,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -293,7 +295,8 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
             }
             result.put("unReadNum", null == unReadNum ? 0 : unReadNum);
         } else {
-            result.put("liked", true);
+            List<TaFavor> taUvList = getFavorListBy(person, person);
+            result.put("liked", null != taUvList && taUvList.size() > 0);
             Integer unReadNum = taChatMapper.getAllUnReadMessage(person.getPersonId());
             result.put("unReadNum", null == unReadNum ? 0 : unReadNum);
         }
@@ -432,15 +435,21 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         personBuildingQueryWrapper.eq("building_id",buildingId);
         List<TaPersonBuilding> list = taPersonBuildingMapper.selectList(personBuildingQueryWrapper);
         List<Integer>idLists = new ArrayList<>();
-        for(int i=0; i<list.size();i++){
-            if(null != list.get(i).getUserId()){
-                idLists.add(list.get(i).getUserId());
-            }
+//        for(int i=0; i<list.size();i++){
+//            if(null != list.get(i).getUserId()){
+//                idLists.add(list.get(i).getUserId());
+//            }
+//        }
+
+        idLists = list.stream().filter(e -> null != e.getUserId()).map(e -> e.getUserId()).collect(Collectors.toList());
+        IPage<TaUser> data = new Page<>();
+        if(CollectionUtils.isNotEmpty(idLists)) {
+            QueryWrapper<TaUser> userQueryWrapper = new QueryWrapper<>();
+            userQueryWrapper.in("user_id",idLists);
+            userQueryWrapper.eq("is_consultant", true);
+            data = taUserService.page(page,userQueryWrapper);
         }
-        QueryWrapper<TaUser> userQueryWrapper = new QueryWrapper<>();
-        userQueryWrapper.in("user_id",idLists);
-        userQueryWrapper.eq("is_consultant", true);
-        IPage<TaUser> data = taUserService.page(page,userQueryWrapper);
+
         return data;
     }
 

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

@@ -0,0 +1,149 @@
+package com.huiju.estateagents.statistic.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.statistic.entity.TaCustomerFollowUpRecord;
+import com.huiju.estateagents.statistic.service.ITaCustomerFollowUpRecordService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    * 跟进记录表 小程序盘客工具我的客户跟进记录信息 前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-11-08
+ */
+@RestController
+@RequestMapping("/")
+public class TaCustomerFollowUpRecordController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaCustomerFollowUpRecordController.class);
+
+    @Autowired
+    public ITaCustomerFollowUpRecordService iTaCustomerFollowUpRecordService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taCustomerFollowUpRecord",method= RequestMethod.GET)
+    public ResponseBean taCustomerFollowUpRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaCustomerFollowUpRecord> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaCustomerFollowUpRecord> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaCustomerFollowUpRecord> result = iTaCustomerFollowUpRecordService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerFollowUpRecordList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taCustomerFollowUpRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taCustomerFollowUpRecord",method= RequestMethod.POST)
+    public ResponseBean taCustomerFollowUpRecordAdd(@RequestBody TaCustomerFollowUpRecord taCustomerFollowUpRecord){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaCustomerFollowUpRecordService.save(taCustomerFollowUpRecord)){
+                responseBean.addSuccess(taCustomerFollowUpRecord);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerFollowUpRecordAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taCustomerFollowUpRecord/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taCustomerFollowUpRecordDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaCustomerFollowUpRecordService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerFollowUpRecordDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taCustomerFollowUpRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taCustomerFollowUpRecord/{id}",method= RequestMethod.PUT)
+    public ResponseBean taCustomerFollowUpRecordUpdate(@PathVariable Integer id,
+                                        @RequestBody TaCustomerFollowUpRecord taCustomerFollowUpRecord){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaCustomerFollowUpRecordService.updateById(taCustomerFollowUpRecord)){
+                responseBean.addSuccess(taCustomerFollowUpRecord);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerFollowUpRecordUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taCustomerFollowUpRecord/{id}",method= RequestMethod.GET)
+    public ResponseBean taCustomerFollowUpRecordGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaCustomerFollowUpRecordService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerFollowUpRecordDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,149 @@
+package com.huiju.estateagents.statistic.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.statistic.entity.TaCustomerGenderStatistic;
+import com.huiju.estateagents.statistic.service.ITaCustomerGenderStatisticService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    * 客户分析性别统计表 小程序盘客工具客户分析 前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-11-08
+ */
+@RestController
+@RequestMapping("/")
+public class TaCustomerGenderStatisticController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaCustomerGenderStatisticController.class);
+
+    @Autowired
+    public ITaCustomerGenderStatisticService iTaCustomerGenderStatisticService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taCustomerGenderStatistic",method= RequestMethod.GET)
+    public ResponseBean taCustomerGenderStatisticList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaCustomerGenderStatistic> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaCustomerGenderStatistic> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaCustomerGenderStatistic> result = iTaCustomerGenderStatisticService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerGenderStatisticList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taCustomerGenderStatistic 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taCustomerGenderStatistic",method= RequestMethod.POST)
+    public ResponseBean taCustomerGenderStatisticAdd(@RequestBody TaCustomerGenderStatistic taCustomerGenderStatistic){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaCustomerGenderStatisticService.save(taCustomerGenderStatistic)){
+                responseBean.addSuccess(taCustomerGenderStatistic);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerGenderStatisticAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taCustomerGenderStatistic/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taCustomerGenderStatisticDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaCustomerGenderStatisticService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerGenderStatisticDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taCustomerGenderStatistic 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taCustomerGenderStatistic/{id}",method= RequestMethod.PUT)
+    public ResponseBean taCustomerGenderStatisticUpdate(@PathVariable Integer id,
+                                        @RequestBody TaCustomerGenderStatistic taCustomerGenderStatistic){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaCustomerGenderStatisticService.updateById(taCustomerGenderStatistic)){
+                responseBean.addSuccess(taCustomerGenderStatistic);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerGenderStatisticUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taCustomerGenderStatistic/{id}",method= RequestMethod.GET)
+    public ResponseBean taCustomerGenderStatisticGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaCustomerGenderStatisticService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerGenderStatisticDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,149 @@
+package com.huiju.estateagents.statistic.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.statistic.entity.TaCustomerStatisticDaily;
+import com.huiju.estateagents.statistic.service.ITaCustomerStatisticDailyService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    * 客户分析日统计表 小程序盘客工具客户分析 前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-11-08
+ */
+@RestController
+@RequestMapping("/")
+public class TaCustomerStatisticDailyController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaCustomerStatisticDailyController.class);
+
+    @Autowired
+    public ITaCustomerStatisticDailyService iTaCustomerStatisticDailyService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taCustomerStatisticDaily",method= RequestMethod.GET)
+    public ResponseBean taCustomerStatisticDailyList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaCustomerStatisticDaily> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaCustomerStatisticDaily> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaCustomerStatisticDaily> result = iTaCustomerStatisticDailyService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerStatisticDailyList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taCustomerStatisticDaily 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taCustomerStatisticDaily",method= RequestMethod.POST)
+    public ResponseBean taCustomerStatisticDailyAdd(@RequestBody TaCustomerStatisticDaily taCustomerStatisticDaily){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaCustomerStatisticDailyService.save(taCustomerStatisticDaily)){
+                responseBean.addSuccess(taCustomerStatisticDaily);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerStatisticDailyAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taCustomerStatisticDaily/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taCustomerStatisticDailyDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaCustomerStatisticDailyService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerStatisticDailyDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taCustomerStatisticDaily 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taCustomerStatisticDaily/{id}",method= RequestMethod.PUT)
+    public ResponseBean taCustomerStatisticDailyUpdate(@PathVariable Integer id,
+                                        @RequestBody TaCustomerStatisticDaily taCustomerStatisticDaily){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaCustomerStatisticDailyService.updateById(taCustomerStatisticDaily)){
+                responseBean.addSuccess(taCustomerStatisticDaily);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerStatisticDailyUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taCustomerStatisticDaily/{id}",method= RequestMethod.GET)
+    public ResponseBean taCustomerStatisticDailyGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaCustomerStatisticDailyService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerStatisticDailyDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,149 @@
+package com.huiju.estateagents.statistic.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.statistic.entity.TaCustomerStatisticMonthly;
+import com.huiju.estateagents.statistic.service.ITaCustomerStatisticMonthlyService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    * 客户分析月统计表 小程序盘客工具客户分析 前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-11-08
+ */
+@RestController
+@RequestMapping("/")
+public class TaCustomerStatisticMonthlyController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaCustomerStatisticMonthlyController.class);
+
+    @Autowired
+    public ITaCustomerStatisticMonthlyService iTaCustomerStatisticMonthlyService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taCustomerStatisticMonthly",method= RequestMethod.GET)
+    public ResponseBean taCustomerStatisticMonthlyList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaCustomerStatisticMonthly> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaCustomerStatisticMonthly> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaCustomerStatisticMonthly> result = iTaCustomerStatisticMonthlyService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerStatisticMonthlyList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taCustomerStatisticMonthly 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taCustomerStatisticMonthly",method= RequestMethod.POST)
+    public ResponseBean taCustomerStatisticMonthlyAdd(@RequestBody TaCustomerStatisticMonthly taCustomerStatisticMonthly){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaCustomerStatisticMonthlyService.save(taCustomerStatisticMonthly)){
+                responseBean.addSuccess(taCustomerStatisticMonthly);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerStatisticMonthlyAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taCustomerStatisticMonthly/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taCustomerStatisticMonthlyDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaCustomerStatisticMonthlyService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerStatisticMonthlyDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taCustomerStatisticMonthly 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taCustomerStatisticMonthly/{id}",method= RequestMethod.PUT)
+    public ResponseBean taCustomerStatisticMonthlyUpdate(@PathVariable Integer id,
+                                        @RequestBody TaCustomerStatisticMonthly taCustomerStatisticMonthly){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaCustomerStatisticMonthlyService.updateById(taCustomerStatisticMonthly)){
+                responseBean.addSuccess(taCustomerStatisticMonthly);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerStatisticMonthlyUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taCustomerStatisticMonthly/{id}",method= RequestMethod.GET)
+    public ResponseBean taCustomerStatisticMonthlyGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaCustomerStatisticMonthlyService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerStatisticMonthlyDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/statistic/entity/TaCustomerFollowUpRecord.java

@@ -0,0 +1,62 @@
+package com.huiju.estateagents.statistic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 跟进记录表 小程序盘客工具我的客户跟进记录信息
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-11-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaCustomerFollowUpRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "follow_up_record_id", type = IdType.AUTO)
+    private Integer followUpRecordId;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+    /**
+     * 记录类型
+     */
+    private String recordType;
+
+    /**
+     * 记录内容
+     */
+    private String recordContent;
+    
+    /**
+     * 跟进人ID
+     */
+    private Integer followerId;
+}

src/main/java/com/huiju/estateagents/statistic/entity/TaCustomerGenderStatistic.java

@@ -0,0 +1,67 @@
+package com.huiju.estateagents.statistic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 客户分析性别统计表 小程序盘客工具客户分析
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-11-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaCustomerGenderStatistic implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "customer_gender_statistic_id", type = IdType.AUTO)
+    private Integer customerGenderStatisticId;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 性别类型 1男2女3未知
+     */
+    private Integer genderType;
+
+    /**
+     * 客户人数
+     */
+    private Integer customerNum;
+
+    /**
+     * 百分比 百分比
+     */
+    private Integer percentage;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateDate;
+    
+    /**
+     * 客户类型 visite 到访客户， new 新增客户 ，follow跟进客户
+     */
+    private String customerType;
+}

src/main/java/com/huiju/estateagents/statistic/entity/TaCustomerStatisticDaily.java

@@ -0,0 +1,56 @@
+package com.huiju.estateagents.statistic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 客户分析日统计表 小程序盘客工具客户分析
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-11-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ta_customer_statistic_daily")
+public class TaCustomerStatisticDaily implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "customer_statistic_daily_id", type = IdType.AUTO)
+    private Integer customerStatisticDailyId;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 客户数量
+     */
+    private Integer customerNum;
+
+    /**
+     * 客户类型 visite 到访客户， new 新增客户 ，follow跟进客户
+     */
+    private String customerType;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+
+}

src/main/java/com/huiju/estateagents/statistic/entity/TaCustomerStatisticMonthly.java

@@ -0,0 +1,66 @@
+package com.huiju.estateagents.statistic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 客户分析月统计表 小程序盘客工具客户分析
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-11-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ta_customer_statistic_monthly")
+public class TaCustomerStatisticMonthly implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "customer_statistic_monthly_id", type = IdType.AUTO)
+    private Integer customerStatisticMonthlyId;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 客户数量
+     */
+    private Integer customerNum;
+
+    /**
+     * 客户类型 visite 到访客户， new 新增客户 ，follow跟进客户
+     */
+    private String customerType;
+
+    /**
+     * 月份 格式yyyymm例201911
+     */
+    private String month;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateDate;
+
+
+}

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

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.statistic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.statistic.entity.TaCustomerFollowUpRecord;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 跟进记录表 小程序盘客工具我的客户跟进记录信息 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-11-08
+ */
+@Mapper
+public interface TaCustomerFollowUpRecordMapper extends BaseMapper<TaCustomerFollowUpRecord> {
+
+}

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

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.statistic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.statistic.entity.TaCustomerGenderStatistic;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 客户分析性别统计表 小程序盘客工具客户分析 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-11-08
+ */
+@Mapper
+public interface TaCustomerGenderStatisticMapper extends BaseMapper<TaCustomerGenderStatistic> {
+
+}

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

@@ -0,0 +1,45 @@
+package com.huiju.estateagents.statistic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 客户分析日统计表 小程序盘客工具客户分析 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-11-08
+ */
+@Mapper
+public interface TaCustomerStatisticDailyMapper extends BaseMapper<TaCustomerStatisticDaily> {
+	
+	/**
+	 * 获取当天跟进客户数
+	 * @param nowDate
+	 * @return
+	 */
+	List<TaCustomerStatisticDaily> getFollowUpData(@Param("nowDate") LocalDateTime nowDate);
+	
+	/**
+	 * 获取当天新增客户数
+	 * @param nowDate
+	 * @param status
+	 * @return
+	 */
+	List<TaCustomerStatisticDaily> getNewCustomerData(@Param("nowDate") LocalDateTime nowDate,@Param("status") int status);
+	
+	/**
+	 * 获取当天到访客户数
+	 * @param nowDate
+	 * @param checkin
+	 * @return
+	 */
+	List<TaCustomerStatisticDaily> getVisiteCustomerData(@Param("nowDate") LocalDateTime nowDate,@Param("checkin") int checkin);
+}

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

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.statistic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.statistic.entity.TaCustomerStatisticMonthly;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 客户分析月统计表 小程序盘客工具客户分析 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-11-08
+ */
+@Mapper
+public interface TaCustomerStatisticMonthlyMapper extends BaseMapper<TaCustomerStatisticMonthly> {
+
+}

src/main/java/com/huiju/estateagents/statistic/service/ITaCustomerFollowUpRecordService.java

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.statistic.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.statistic.entity.TaCustomerFollowUpRecord;
+
+/**
+ * <p>
+ * 跟进记录表 小程序盘客工具我的客户跟进记录信息 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-11-08
+ */
+public interface ITaCustomerFollowUpRecordService extends IService<TaCustomerFollowUpRecord> {
+
+}

src/main/java/com/huiju/estateagents/statistic/service/ITaCustomerGenderStatisticService.java

@@ -0,0 +1,35 @@
+package com.huiju.estateagents.statistic.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.statistic.entity.TaCustomerGenderStatistic;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 客户分析性别统计表 小程序盘客工具客户分析 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-11-08
+ */
+public interface ITaCustomerGenderStatisticService extends IService<TaCustomerGenderStatistic> {
+	
+	/**
+	 * 每天的新增客户性别统计
+	 * @param nowDate
+	 */
+	void newCustomerSexStatisticDaily(LocalDateTime nowDate);
+	
+	/**
+	 * 每天的跟进客户性别统计
+	 * @param nowDate
+	 */
+	void followUpSexStatisticDaily(LocalDateTime nowDate);
+	
+	/**
+	 * 每天的到访客户性别统计
+	 * @param nowDate
+	 */
+	void visiteSexStatisticDaily(LocalDateTime nowDate);
+}

src/main/java/com/huiju/estateagents/statistic/service/ITaCustomerStatisticDailyService.java

@@ -0,0 +1,35 @@
+package com.huiju.estateagents.statistic.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 客户分析日统计表 小程序盘客工具客户分析 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-11-08
+ */
+public interface ITaCustomerStatisticDailyService extends IService<TaCustomerStatisticDaily> {
+	
+	/**
+	 * 每天的跟进客户统计
+	 * @param nowDate
+	 */
+	void followUpStatisticDaily(LocalDateTime nowDate);
+	
+	/**
+	 * 每天的新增客户统计
+	 * @param nowDate
+	 */
+	void newCustomerStatisticDaily(LocalDateTime nowDate);
+	
+	/**
+	 * 每天的到访客户统计
+	 * @param nowDate
+	 */
+	void visiteStatisticDaily(LocalDateTime nowDate);
+}

src/main/java/com/huiju/estateagents/statistic/service/ITaCustomerStatisticMonthlyService.java

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.statistic.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.statistic.entity.TaCustomerStatisticMonthly;
+
+/**
+ * <p>
+ * 客户分析月统计表 小程序盘客工具客户分析 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-11-08
+ */
+public interface ITaCustomerStatisticMonthlyService extends IService<TaCustomerStatisticMonthly> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.statistic.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.statistic.entity.TaCustomerFollowUpRecord;
+import com.huiju.estateagents.statistic.mapper.TaCustomerFollowUpRecordMapper;
+import com.huiju.estateagents.statistic.service.ITaCustomerFollowUpRecordService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 跟进记录表 小程序盘客工具我的客户跟进记录信息 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-11-08
+ */
+@Service
+public class TaCustomerFollowUpRecordServiceImpl extends ServiceImpl<TaCustomerFollowUpRecordMapper, TaCustomerFollowUpRecord> implements ITaCustomerFollowUpRecordService {
+
+}

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

@@ -0,0 +1,55 @@
+package com.huiju.estateagents.statistic.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.statistic.entity.TaCustomerGenderStatistic;
+import com.huiju.estateagents.statistic.mapper.TaCustomerGenderStatisticMapper;
+import com.huiju.estateagents.statistic.service.ITaCustomerGenderStatisticService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 客户分析性别统计表 小程序盘客工具客户分析 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-11-08
+ */
+@Service
+public class TaCustomerGenderStatisticServiceImpl extends ServiceImpl<TaCustomerGenderStatisticMapper, TaCustomerGenderStatistic> implements ITaCustomerGenderStatisticService {
+	
+	@Autowired
+	private TaCustomerGenderStatisticMapper customerGenderStatisticMapper;
+	
+	/**
+	 * 每天的新增客户性别统计
+	 *
+	 * @param nowDate
+	 */
+	@Override
+	public void newCustomerSexStatisticDaily(LocalDateTime nowDate) {
+	
+	}
+	
+	/**
+	 * 每天的跟进客户性别统计
+	 *
+	 * @param nowDate
+	 */
+	@Override
+	public void followUpSexStatisticDaily(LocalDateTime nowDate) {
+	
+	}
+	
+	/**
+	 * 每天的到访客户性别统计
+	 *
+	 * @param nowDate
+	 */
+	@Override
+	public void visiteSexStatisticDaily(LocalDateTime nowDate) {
+	
+	}
+}

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

@@ -0,0 +1,90 @@
+package com.huiju.estateagents.statistic.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily;
+import com.huiju.estateagents.statistic.mapper.TaCustomerStatisticDailyMapper;
+import com.huiju.estateagents.statistic.service.ITaCustomerStatisticDailyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 客户分析日统计表 小程序盘客工具客户分析 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-11-08
+ */
+@Service
+public class TaCustomerStatisticDailyServiceImpl extends ServiceImpl<TaCustomerStatisticDailyMapper, TaCustomerStatisticDaily> implements ITaCustomerStatisticDailyService {
+	
+	@Autowired
+	private TaCustomerStatisticDailyMapper customerStatisticDailyMapper;
+	
+	/**
+	 * 每天的跟进客户统计
+	 *
+	 * @param nowDate
+	 */
+	@Override
+	public void followUpStatisticDaily(LocalDateTime nowDate) {
+		//按当前时间获取当天的跟进客户的数量，多一个客户进行多次跟进行为，只记录一次
+		List<TaCustomerStatisticDaily> list = customerStatisticDailyMapper.getFollowUpData(nowDate);
+		//批量保存
+		statisticDailySaveBatch(list,nowDate,CommConstant.CUSTOMER_TYPE_FOLLOW);
+	}
+	
+	/**
+	 * 每天的新增客户统计
+	 *
+	 * @param nowDate
+	 */
+	@Override
+	public void newCustomerStatisticDaily(LocalDateTime nowDate) {
+		//按当前时间获取当天的新增客户的数量，ta_recommend_customer 表的status 为1 的就是新增客户
+		List<TaCustomerStatisticDaily> list = customerStatisticDailyMapper.getNewCustomerData(nowDate,CommConstant.STATUS_NORMAL);
+		//批量保存
+		statisticDailySaveBatch(list,nowDate,CommConstant.CUSTOMER_TYPE_NEW);
+	}
+	
+	/**
+	 * 每天的到访客户统计
+	 *
+	 * @param nowDate
+	 */
+	@Override
+	public void visiteStatisticDaily(LocalDateTime nowDate) {
+		//按当前时间获取当天的到访客户的数量，同一天同一个项目只记录一次
+		List<TaCustomerStatisticDaily> list = customerStatisticDailyMapper.getVisiteCustomerData(nowDate,CommConstant.STATUS_NORMAL);
+		List<TaCustomerStatisticDaily> saveList = new ArrayList<>();
+		list.forEach(e -> {
+			if (null != e.getOrgId() && !e.getOrgId().equals("null")){
+				saveList.add(e);
+			}
+		});
+		//批量保存
+		statisticDailySaveBatch(saveList,nowDate,CommConstant.CUSTOMER_TYPE_VISITE);
+	}
+	
+	/**
+	 * 批量保存当天的统计数据
+	 * @param list
+	 * @param nowDate
+	 * @param customerType
+	 */
+	private void statisticDailySaveBatch(List<TaCustomerStatisticDaily> list, LocalDateTime nowDate, String customerType) {
+		list.forEach(e -> {
+			e.setCreateDate(nowDate);
+			e.setCustomerType(customerType);
+		});
+		//批量保存
+		this.saveBatch(list);
+	}
+}

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.statistic.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.statistic.entity.TaCustomerStatisticMonthly;
+import com.huiju.estateagents.statistic.mapper.TaCustomerStatisticMonthlyMapper;
+import com.huiju.estateagents.statistic.service.ITaCustomerStatisticMonthlyService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 客户分析月统计表 小程序盘客工具客户分析 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-11-08
+ */
+@Service
+public class TaCustomerStatisticMonthlyServiceImpl extends ServiceImpl<TaCustomerStatisticMonthlyMapper, TaCustomerStatisticMonthly> implements ITaCustomerStatisticMonthlyService {
+
+}

src/main/resources/application-demo.yml

@@ -22,7 +22,7 @@ mybatis-plus:
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     call-setters-on-nulls: true
-  mapper-locations: classpath:mapper/*.xml
+  mapper-locations: classpath:mapper/**/*.xml
 wx:
   miniapp:
     appid: wx65d61e127ed35d5e

src/main/resources/application-dev.yml

@@ -22,7 +22,7 @@ mybatis-plus:
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     call-setters-on-nulls: true
-  mapper-locations: classpath:mapper/*.xml
+  mapper-locations: classpath:mapper/**/*.xml
 wx:
   miniapp:
     appid: wxd6f47a9bb3052175

src/main/resources/application-gzysd.yml

@@ -22,7 +22,7 @@ mybatis-plus:
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     call-setters-on-nulls: true
-  mapper-locations: classpath:mapper/*.xml
+  mapper-locations: classpath:mapper/**/*.xml
 wx:
   miniapp:
     appid: wxe3b1e683853800b5

src/main/resources/application-nj.yml

@@ -22,7 +22,7 @@ mybatis-plus:
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     call-setters-on-nulls: true
-  mapper-locations: classpath:mapper/*.xml
+  mapper-locations: classpath:mapper/**/*.xml
 wx:
   miniapp:
     appid: wx1a3e5f7d0139285e

src/main/resources/application-prod.yml

@@ -22,7 +22,7 @@ mybatis-plus:
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     call-setters-on-nulls: true
-  mapper-locations: classpath:mapper/*.xml
+  mapper-locations: classpath:mapper/**/*.xml
 wx:
   miniapp:
     appid: wxd6f47a9bb3052175

src/main/resources/application-test.yml

@@ -22,7 +22,7 @@ mybatis-plus:
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     call-setters-on-nulls: true
-  mapper-locations: classpath:mapper/*.xml
+  mapper-locations: classpath:mapper/**/*.xml
 wx:
   miniapp:
     appid: wxc56decdcbc64d8de

src/main/resources/application-v3.yml

@@ -22,7 +22,7 @@ mybatis-plus:
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     call-setters-on-nulls: true
-  mapper-locations: classpath:mapper/*.xml
+  mapper-locations: classpath:mapper/**/*.xml
 
 ali:
   accessKeyId: LTAIkc75dpkJw8Lb

src/main/resources/application-xs.yml

@@ -22,7 +22,7 @@ mybatis-plus:
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     call-setters-on-nulls: true
-  mapper-locations: classpath:mapper/*.xml
+  mapper-locations: classpath:mapper/**/*.xml
 wx:
   miniapp:
     appid: wx09cd665abf378db7

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.statistic.mapper.TaCustomerFollowUpRecordMapper">
+
+</mapper>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.statistic.mapper.TaCustomerGenderStatisticMapper">
+
+</mapper>

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

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.statistic.mapper.TaCustomerStatisticDailyMapper">
+
+    <select id="getFollowUpData" resultType="com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily">
+        SELECT
+            org_id,
+            count( DISTINCT ( customer_id ) ) as customer_num
+        FROM
+            ta_customer_follow_up_record
+        WHERE
+            date_format( create_date, '%Y-%m-%d' ) = date_format( #{nowDate}, '%Y-%m-%d' )
+        GROUP BY
+            org_id
+    </select>
+
+    <select id="getNewCustomerData" resultType="com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily">
+        SELECT
+            org_id,
+            count( customer_id ) as customer_num
+        FROM
+            ta_recommend_customer
+        WHERE
+            `STATUS` = #{status}
+            AND date_format( create_date, '%Y-%m-%d' ) = date_format( #{nowDate}, '%Y-%m-%d' )
+        GROUP BY
+            org_id
+    </select>
+    <select id="getVisiteCustomerData" resultType="com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily">
+        SELECT
+            count( DISTINCT ( c.customer_id ) ) as customer_num,
+            c.org_id
+        FROM
+            ta_activity_dynamic_enlist t
+            LEFT JOIN ta_recommend_customer c ON t.person_id = c.person_id
+            AND t.building_id = c.building_id
+            AND t.org_id = c.org_id
+        WHERE
+            t.is_checkin = #{checkin}
+            AND date_format( t.create_date, '%Y-%m-%d' ) = date_format( #{nowDate}, '%Y-%m-%d' )
+        GROUP BY
+            c.org_id
+    </select>
+</mapper>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.statistic.mapper.TaCustomerStatisticMonthlyMapper">
+
+</mapper>