* 新需求

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

@@ -0,0 +1,143 @@
+package com.huiju.estateagents.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.entity.TaQrcode;
+import com.huiju.estateagents.service.ITaQrcodeService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    * 二维码管理表 前端控制器
+    * </p>
+ *
+ * @author fxf
+ * @since 2020-05-20
+ */
+@RestController
+@RequestMapping("/")
+public class TaQrcodeController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaQrcodeController.class);
+
+    @Autowired
+    public ITaQrcodeService iTaQrcodeService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taQrcode",method= RequestMethod.GET)
+    public ResponseBean taQrcodeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaQrcode> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaQrcode> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaQrcode> result = iTaQrcodeService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taQrcodeList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taQrcode 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taQrcode",method= RequestMethod.POST)
+    public ResponseBean taQrcodeAdd(@RequestBody TaQrcode taQrcode){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaQrcodeService.save(taQrcode)){
+                responseBean.addSuccess(taQrcode);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taQrcodeAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taQrcode/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taQrcodeDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaQrcodeService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taQrcodeDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taQrcode 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taQrcode/{id}",method= RequestMethod.PUT)
+    public ResponseBean taQrcodeUpdate(@PathVariable Integer id,
+                                        @RequestBody TaQrcode taQrcode){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaQrcodeService.updateById(taQrcode)){
+                responseBean.addSuccess(taQrcode);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taQrcodeUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taQrcode/{id}",method= RequestMethod.GET)
+    public ResponseBean taQrcodeGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaQrcodeService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taQrcodeDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -846,6 +846,8 @@ public class TaRecommendCustomerController extends BaseController {
                                       @RequestParam(value = "customerType") String customerType,
                                       @RequestParam(value = "status", required = false) Integer status,
                                       @RequestParam(value = "sceneType", required = false) String sceneType,
+                                      @RequestParam(value = "startCreateDate", required = false) String startCreateDate,
+                                      @RequestParam(value = "endCreateDate", required = false) String endCreateDate,
                                       @RequestParam(value = "belongStatus", required = false) Integer belongStatus) throws IOException { // public 公  private 私
 
         //        response.setContentType("application/vnd.ms-excel");
@@ -874,7 +876,9 @@ public class TaRecommendCustomerController extends BaseController {
 //            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
 //            List<PublicCustomerExport> publicList = null;
 //            do {
-            List<PublicCustomerExport> publicList = taRecommendCustomerMapper.getPublicCustomerExportList(pageCode * pageSize, pageSize, buildingId, name, tel, entryType, verifyStatus, sex, orgId, consultTel, sceneType, getTaPersonBuildingListByUserId(request), belongStatus);
+            List<PublicCustomerExport> publicList = taRecommendCustomerMapper.getPublicCustomerExportList(pageCode * pageSize, pageSize,
+                    buildingId, name, tel, entryType, verifyStatus, sex, orgId, consultTel, sceneType, getTaPersonBuildingListByUserId(request),
+                    belongStatus, startCreateDate, endCreateDate);
             excelWriter.write(publicList, writeSheet);
 
 //                pageCode ++;
@@ -896,7 +900,9 @@ public class TaRecommendCustomerController extends BaseController {
 //            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
 //            List<PrivateCustomerExport> privateList = null;
 //            do {
-            List<PrivateCustomerExport> privateList = taRecommendCustomerMapper.getCustomerExportList(pageCode * pageSize, pageSize, buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId, status, sceneType, getTaPersonBuildingListByUserId(request));
+            List<PrivateCustomerExport> privateList = taRecommendCustomerMapper.getCustomerExportList(pageCode * pageSize, pageSize,
+                    buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId, status, sceneType, startCreateDate,
+                    endCreateDate, getTaPersonBuildingListByUserId(request));
             excelWriter.write(privateList, writeSheet);
 
 //                pageCode ++;
@@ -976,35 +982,37 @@ public class TaRecommendCustomerController extends BaseController {
 
     /**
      * 校验此职业顾问下有没有私客存在
+     *
      * @return
      */
     @GetMapping("/admin/consultant/customer/list")
     public ResponseBean consultantCustomerList(@RequestParam(value = "userId") Integer userId,
                                                @RequestParam(value = "personId") String personId,
                                                @RequestParam(value = "buildingId") String buildingId,
-                                               HttpServletRequest request){
+                                               HttpServletRequest request) {
         Integer orgId = getOrgId(request);
-        try{
-            List<TaRecommendCustomer> list = taRecommendCustomerService.getConsultantCustomerList(userId,personId,buildingId,orgId,getTaPersonBuildingListByUserId(request));
+        try {
+            List<TaRecommendCustomer> list = taRecommendCustomerService.getConsultantCustomerList(userId, personId, buildingId, orgId, getTaPersonBuildingListByUserId(request));
             return ResponseBean.success(list);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
     /**
      * 迁移私客到新的置业顾问
+     *
      * @return
      */
     @PutMapping("/admin/consultant/customer/move")
-    public ResponseBean moveConsultantCustomer(@RequestBody List<TaRecommendCustomer> list,HttpServletRequest request){
-        try{
+    public ResponseBean moveConsultantCustomer(@RequestBody List<TaRecommendCustomer> list, HttpServletRequest request) {
+        try {
             taRecommendCustomerService.updateBatchById(list);
             return ResponseBean.success(list);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 }

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

@@ -0,0 +1,83 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 二维码管理表
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-05-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaQrcode implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * qr_code_id id
+     */
+    @TableId(value = "qr_code_id", type = IdType.AUTO)
+    private Integer qrCodeId;
+
+    /**
+     * org_id
+     */
+    private Integer orgId;
+
+    /**
+     * building_id 关联项目ID
+     */
+    private String buildingId;
+
+    /**
+     * channel_id 渠道ID
+     */
+    private Integer channelId;
+
+    /**
+     * target_type 二维码类型
+     */
+    private String targetType;
+
+    /**
+     * target_name 二维码内容
+     */
+    private String targetName;
+
+    /**
+     * target_id
+     */
+    private String targetId;
+
+    /**
+     * qr_code_url 二维码地址
+     */
+    private String qrCodeUrl;
+
+    /**
+     * status 状态
+     */
+    private Integer status;
+
+    /**
+     * create_date 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * create_user 创建人
+     */
+    private Integer createUser;
+
+
+}

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

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.mapper;
+
+import com.huiju.estateagents.entity.TaQrcode;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 二维码管理表 Mapper 接口
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-05-20
+ */
+public interface TaQrcodeMapper extends BaseMapper<TaQrcode> {
+
+}

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

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.excel.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -27,19 +28,23 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
 
     Integer getMyCutsomerNum(@Param("personId") String personId);
 
-    String getCustomerPersonId(@Param("customerId")String customerId);
+    String getCustomerPersonId(@Param("customerId") String customerId);
 
-    TaRecommendCustomer getCustomerDetail(@Param("customerId")String customerId,@Param("personId")String personId);
+    TaRecommendCustomer getCustomerDetail(@Param("customerId") String customerId, @Param("personId") String personId);
 
-    TaRecommendCustomer getCustomerById(@Param("customerId")String customerId);
+    TaRecommendCustomer getCustomerById(@Param("customerId") String customerId);
 
-    IPage<TaRecommendCustomer> getCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("status")Integer status, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("sceneType") String sceneType, @Param("startCreateDate") String startCreateDate, @Param("endCreateDate") String endCreateDate, @Param("sharePersonName") String sharePersonName);
-    IPage<TaRecommendCustomer> getRecCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
-    IPage<TaRecommendCustomer> getRepCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
-    IPage<TaPerson> getIndependentAgents(IPage<TaPerson>page, @Param("name") String name, @Param("tel") String tel, @Param("channelId") String channelId, @Param("orgId") Integer orgId);
+    IPage<TaRecommendCustomer> getCustomerList(IPage<TaRecommendCustomer> page, @Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("status") Integer status, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList, @Param("sceneType") String sceneType, @Param("startCreateDate") String startCreateDate, @Param("endCreateDate") String endCreateDate, @Param("sharePersonName") String sharePersonName);
+
+    IPage<TaRecommendCustomer> getRecCustomerList(IPage<TaRecommendCustomer> page, @Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+
+    IPage<TaRecommendCustomer> getRepCustomerList(IPage<TaRecommendCustomer> page, @Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+
+    IPage<TaPerson> getIndependentAgents(IPage<TaPerson> page, @Param("name") String name, @Param("tel") String tel, @Param("channelId") String channelId, @Param("orgId") Integer orgId);
 
     /**
      * 公客
+     *
      * @param page
      * @param name
      * @param tel
@@ -67,34 +72,39 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
 
     /**
      * 导出数据 获取推荐用户数据
+     *
      * @param orgId
      * @return
      */
-    List<ExcelRecommendCustomer> getRecCustomerExport(@Param("orgId") Integer orgId, @Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+    List<ExcelRecommendCustomer> getRecCustomerExport(@Param("orgId") Integer orgId, @Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
     /**
      * 导出数据 获取推荐用户数据 总数
+     *
      * @param orgId
      * @return
      */
-    Integer getRecCustomerExportCount(@Param("orgId") Integer orgId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+    Integer getRecCustomerExportCount(@Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
     /**
      * 导出数据 获取报备客户数据 总数
+     *
      * @param orgId
      * @return
      */
-    Integer getRepCustomerReportCount(@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex,@Param("orgId")Integer orgId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+    Integer getRepCustomerReportCount(@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
     /**
      * 导出数据 获取报备客户数据
+     *
      * @param orgId
      * @return
      */
-    List<ReporRecommendCustomer> getRepCustomerReportExport(@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+    List<ReporRecommendCustomer> getRepCustomerReportExport(@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
     /**
      * 导出数据 获取经纪人数据 总数
+     *
      * @param orgId
      * @return
      */
@@ -102,15 +112,17 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
 
     /**
      * 导出数据 获取经纪人数据
+     *
      * @param orgId
      * @param pageCode
      * @param pageSize
      * @return
      */
-    List<AgentsRecommendCustomer> getIndependentAgentsExport(@Param("name")String name, @Param("tel")String tel, @Param("channelId")String channelId, @Param("orgId") Integer orgId, @Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize);
+    List<AgentsRecommendCustomer> getIndependentAgentsExport(@Param("name") String name, @Param("tel") String tel, @Param("channelId") String channelId, @Param("orgId") Integer orgId, @Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize);
 
     /**
      * 导出数据 公客总数
+     *
      * @param name
      * @param tel
      * @param entryType
@@ -120,10 +132,11 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param consultTel
      * @return
      */
-    Integer getPublicCustomerExportListCount(@Param("name") String name, @Param("tel") String tel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("consultTel")String consultTel);
+    Integer getPublicCustomerExportListCount(@Param("name") String name, @Param("tel") String tel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("consultTel") String consultTel);
 
     /**
      * 导出数据 公客
+     *
      * @param name
      * @param tel
      * @param entryType
@@ -135,20 +148,23 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      */
     List<PublicCustomerExport> getPublicCustomerExportList(@Param("pageCode") Integer pageCode,
                                                            @Param("pageSize") Integer pageSize,
-                                                           @Param("buildingId")String buildingId,
+                                                           @Param("buildingId") String buildingId,
                                                            @Param("name") String name,
                                                            @Param("tel") String tel,
                                                            @Param("entryType") String entryType,
                                                            @Param("verifyStatus") String verifyStatus,
                                                            @Param("sex") Integer sex,
                                                            @Param("orgId") Integer orgId,
-                                                           @Param("consultTel")String consultTel,
-                                                           @Param("sceneType")String sceneType,
+                                                           @Param("consultTel") String consultTel,
+                                                           @Param("sceneType") String sceneType,
                                                            @Param("personBuildingList") List<TaPersonBuilding> personBuildingList,
-                                                           @Param("belongStatus") Integer belongStatus);
+                                                           @Param("belongStatus") Integer belongStatus,
+                                                           @Param("startCreateDate") String startCreateDate,
+                                                           @Param("endCreateDate") String endCreateDate);
 
     /**
      * 导出数据 私客总数
+     *
      * @param buildingId
      * @param name
      * @param tel
@@ -161,10 +177,11 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param status
      * @return
      */
-    Integer getCustomerExportListCount(@Param("building") String buildingId, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("status")Integer status,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+    Integer getCustomerExportListCount(@Param("building") String buildingId, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("status") Integer status, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
     /**
      * 导出数据 私客
+     *
      * @param pageCode
      * @param pageSize
      * @param buildingId
@@ -179,18 +196,35 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param status
      * @return
      */
-    List<PrivateCustomerExport> getCustomerExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("building") String buildingId, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("status")Integer status,@Param("sceneType") String sceneType,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
-    
+    List<PrivateCustomerExport> getCustomerExportList(@Param("pageCode") Integer pageCode,
+                                                      @Param("pageSize") Integer pageSize,
+                                                      @Param("building") String buildingId,
+                                                      @Param("name") String name,
+                                                      @Param("tel") String tel,
+                                                      @Param("consultName") String consultName,
+                                                      @Param("consultTel") String consultTel,
+                                                      @Param("entryType") String entryType,
+                                                      @Param("verifyStatus") String verifyStatus,
+                                                      @Param("sex") Integer sex,
+                                                      @Param("orgId") Integer orgId,
+                                                      @Param("status") Integer status,
+                                                      @Param("sceneType") String sceneType,
+                                                      @Param("startCreateDate") String startCreateDate,
+                                                      @Param("endCreateDate") String endCreateDate,
+                                                      @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+
     /**
      * 获取我的客户的人数统计
+     *
      * @param personId
      * @param userId
      * @return
      */
-	Map<String, Object> getMyCustStatistics(@Param("personId") String personId,@Param("userId") Integer userId,@Param("orgId") Integer orgId);
-    
+    Map<String, Object> getMyCustStatistics(@Param("personId") String personId, @Param("userId") Integer userId, @Param("orgId") Integer orgId);
+
     /**
      * 获取我的跟进客户数据
+     *
      * @param page
      * @param personId
      * @param userId
@@ -205,18 +239,19 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param endArrivalDate
      * @return
      */
-    IPage<TaRecommendCustomer> getMyCustFollowOrClinch(IPage<TaRecommendCustomer> page, @Param("personId") String personId, @Param("userId") Integer userId, @Param("orgId") Integer orgId, @Param("type") String type, @Param("name") String name, @Param("phone") String phone, @Param("status") Integer status,@Param("startReportDate") String startReportDate,@Param("endReportDate") String endReportDate,@Param("startArrivalDate") String startArrivalDate,@Param("endArrivalDate") String endArrivalDate);
-    
+    IPage<TaRecommendCustomer> getMyCustFollowOrClinch(IPage<TaRecommendCustomer> page, @Param("personId") String personId, @Param("userId") Integer userId, @Param("orgId") Integer orgId, @Param("type") String type, @Param("name") String name, @Param("phone") String phone, @Param("status") Integer status, @Param("startReportDate") String startReportDate, @Param("endReportDate") String endReportDate, @Param("startArrivalDate") String startArrivalDate, @Param("endArrivalDate") String endArrivalDate);
+
     /**
      * 获取我的客户详情数据
+     *
      * @param customerId
      * @return
      */
     TaRecommendCustomer getMyCustDetailById(String customerId);
 
-    List<PersonIntention> getCustomerIntentions(@Param("personId")String personId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+    List<PersonIntention> getCustomerIntentions(@Param("personId") String personId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
-    IPage<TaRecommendCustomer>getCustomersIRecommended(IPage<TaRecommendCustomer> page,@Param("customerId")String customerId,@Param("status")Integer status,@Param("orgId") Integer orgId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+    IPage<TaRecommendCustomer> getCustomersIRecommended(IPage<TaRecommendCustomer> page, @Param("customerId") String customerId, @Param("status") Integer status, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
     IPage<TaRecommendCustomer> getCustomerListOfConsultant(IPage<TaRecommendCustomer> page,
                                                            @Param("orgId") Integer orgId,
@@ -230,6 +265,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * 查询 person 对应 楼盘 的客户
      * 如果对应的楼盘没有客户, 则返回无楼盘的, 小程序级别的客户信息
      * 如果没有无小程序级别客户, 则返回最早的一条
+     *
      * @param orgId
      * @param personId
      * @param buildingId
@@ -239,12 +275,13 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
 
     /**
      * 获取置业福问下的客户
+     *
      * @param userId
      * @param personId
      * @param buildingId
      * @param orgId
      * @return
      */
-    List<TaRecommendCustomer> getConsultantCustomerList(@Param("userId") Integer userId,@Param("personId") String personId,@Param("buildingId") String buildingId,@Param("orgId") Integer orgId);
+    List<TaRecommendCustomer> getConsultantCustomerList(@Param("userId") Integer userId, @Param("personId") String personId, @Param("buildingId") String buildingId, @Param("orgId") Integer orgId);
 
 }

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

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.huiju.estateagents.entity.TaQrcode;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 二维码管理表 服务类
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-05-20
+ */
+public interface ITaQrcodeService extends IService<TaQrcode> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.huiju.estateagents.entity.TaQrcode;
+import com.huiju.estateagents.mapper.TaQrcodeMapper;
+import com.huiju.estateagents.service.ITaQrcodeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 二维码管理表 服务实现类
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-05-20
+ */
+@Service
+public class TaQrcodeServiceImpl extends ServiceImpl<TaQrcodeMapper, TaQrcode> implements ITaQrcodeService {
+
+}

src/main/resources/mapper/TaQrcodeMapper.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.mapper.TaQrcodeMapper">
+
+</mapper>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -622,6 +622,12 @@
         <if test="sex != null and sex !=''">
             and t.sex = #{sex}
         </if>
+        <if test="startCreateDate != null and startCreateDate !=''">
+            and t.create_Date >= #{startCreateDate}
+        </if>
+        <if test="endCreateDate != null and endCreateDate !=''">
+            and t.create_Date &lt;= #{endCreateDate}
+        </if>
         <if test="personBuildingList != null and personBuildingList.size > 0">
             AND t.building_id in
             <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
@@ -682,6 +688,12 @@
             <if test="sex != null and sex !=''">
                 and a.sex = #{sex}
             </if>
+            <if test="startCreateDate != null and startCreateDate !=''">
+                and a.create_Date >= #{startCreateDate}
+            </if>
+            <if test="endCreateDate != null and endCreateDate !=''">
+                and a.create_Date &lt;= #{endCreateDate}
+            </if>
             <if test="personBuildingList != null and personBuildingList.size > 0">
                 AND a.building_id in
                 <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
@@ -723,9 +735,6 @@
         LEFT JOIN ta_person p2 ON a.person_id = p2.person_id
         LEFT JOIN ta_person c ON p2.recommend_person = c.person_id
         left join ta_building t on a.building_id = t.building_id
-        --         LEFT JOIN ta_person c ON p.share_person_id = c.person_id
-        --         left join ta_building t on a.building_id = t.building_id
-        --         LEFT JOIN td_wx_dict w ON p.scene_id = w.scene_id
         left JOIN (select sum(points_amount) as points,person_id from ta_points_records where org_id = #{orgId} GROUP BY
         person_id) s on a.person_id = s.person_id
         left join (select sum(t.intention) as intention,t.person_id From ta_person_intention_record t where t.org_id =
@@ -765,6 +774,12 @@
             <if test="sex != null and sex !=''">
                 and a.sex = #{sex}
             </if>
+            <if test="startCreateDate != null and startCreateDate !=''">
+                and a.create_Date >= #{startCreateDate}
+            </if>
+            <if test="endCreateDate != null and endCreateDate !=''">
+                and a.create_Date &lt;= #{endCreateDate}
+            </if>
             <if test="personBuildingList != null and personBuildingList.size > 0">
                 AND a.building_id in
                 <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">