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

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

@@ -73,7 +73,8 @@ public class TaNewsController extends BaseController {
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
             @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query",value = "项目id"),
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "newsTypeId", paramType = "query",value = "资讯类型id"),
-            @ApiImplicitParam(dataTypeClass = Integer.class, name = "newsStatus", paramType = "query",value = "状态")
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "newsStatus", paramType = "query",value = "状态"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "title", paramType = "query",value = "标题")
     })
     @RequestMapping(value="/admin/taNews",method= RequestMethod.GET)
     public ResponseBean taNewsList(HttpServletRequest request,
@@ -81,8 +82,9 @@ public class TaNewsController extends BaseController {
                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                    @RequestParam(value = "buildingId", required = false) String buildingId,
                                    @RequestParam(value = "newsTypeId", required = false) Integer newsTypeId,
-                                   @RequestParam(value = "newsStatus", required = false) Integer newsStatus){
-        ResponseBean responseBean = iTaNewsService.getList(pageNum, pageSize, buildingId, getOrgId(request), newsTypeId, newsStatus);
+                                   @RequestParam(value = "newsStatus", required = false) Integer newsStatus,
+                                   @RequestParam(value = "title", required = false) String title){
+        ResponseBean responseBean = iTaNewsService.getList(pageNum, pageSize, buildingId, getOrgId(request), newsTypeId, newsStatus,title);
         return responseBean;
     }
 

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

@@ -16,10 +16,9 @@ import com.huiju.estateagents.entity.TaChannelPerson;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaRecommendCustomer;
 import com.huiju.estateagents.event.EventBus;
-import com.huiju.estateagents.excel.AgentsRecommendCustomer;
-import com.huiju.estateagents.excel.ExcelRecommendCustomer;
-import com.huiju.estateagents.excel.ReporRecommendCustomer;
+import com.huiju.estateagents.excel.*;
 import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
+import com.huiju.estateagents.mapper.TaRecommendCustomerMapper;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaRecommendCustomerService;
 import com.huiju.estateagents.service.TaChannelPersonService;
@@ -70,6 +69,9 @@ public class TaRecommendCustomerController extends BaseController {
     @Autowired
     private TaChannelPersonService taChannelPersonService;
 
+    @Autowired
+    private TaRecommendCustomerMapper taRecommendCustomerMapper;
+
     /**
      * 我的客户列表
      * @param pageNumber
@@ -494,7 +496,7 @@ public class TaRecommendCustomerController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             TaRecommendCustomer taRecommendCustomer = taRecommendCustomerService.getById(id);
-            if(taRecommendCustomer.getVerifyStatus().equals(CommConstant.VERIFY_READY) ){
+            if(null == taRecommendCustomer.getVerifyStatus()){ // taRecommendCustomer.getVerifyStatus().equals(CommConstant.VERIFY_READY)
                 taRecommendCustomer.setVerifyStatus(verifyStatus);
                 if(!StringUtils.isEmpty(verifyRemark)){
                     taRecommendCustomer.setVerifyRemark(verifyRemark);
@@ -536,7 +538,7 @@ public class TaRecommendCustomerController extends BaseController {
 
         Integer count = taRecommendCustomerService.getRecCustomerExportCount(getOrgId(request));
 
-        Integer pageCode = 1;
+        Integer pageCode = 0;
         Integer pageSize = 100;
         // 总页数
         Integer pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
@@ -545,7 +547,7 @@ public class TaRecommendCustomerController extends BaseController {
         // 设置 sheet, 同一个sheet只需要设置一次
         WriteSheet writeSheet = EasyExcel.writerSheet("推荐客户").build();
         do {
-            List<ExcelRecommendCustomer> recCustomerExport = taRecommendCustomerService.getRecCustomerExport(getOrgId(request), pageCode, pageSize);
+            List<ExcelRecommendCustomer> recCustomerExport = taRecommendCustomerService.getRecCustomerExport(getOrgId(request), pageCode * pageSize, pageSize);
             excelWriter.write(recCustomerExport, writeSheet);
 
             pageCode ++;
@@ -569,7 +571,7 @@ public class TaRecommendCustomerController extends BaseController {
 
         Integer count = taRecommendCustomerService.getRepCustomerReportCount(getOrgId(request));
 
-        Integer pageCode = 1;
+        Integer pageCode = 0;
         Integer pageSize = 100;
         // 总页数
         Integer pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
@@ -579,7 +581,7 @@ public class TaRecommendCustomerController extends BaseController {
         WriteSheet writeSheet = EasyExcel.writerSheet("报备客户").build();
         List<ReporRecommendCustomer> recCustomerExport = null;
         do {
-            recCustomerExport = taRecommendCustomerService.getRepCustomerReportExport(getOrgId(request), pageCode, pageSize);
+            recCustomerExport = taRecommendCustomerService.getRepCustomerReportExport(getOrgId(request), pageCode * pageSize, pageSize);
             excelWriter.write(recCustomerExport, writeSheet);
 
             pageCode ++;
@@ -602,7 +604,7 @@ public class TaRecommendCustomerController extends BaseController {
 
         Integer count = taRecommendCustomerService.getIndependentAgentsCount(getOrgId(request));
 
-        Integer pageCode = 1;
+        Integer pageCode = 0;
         Integer pageSize = 100;
         // 总页数
         Integer pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
@@ -612,7 +614,7 @@ public class TaRecommendCustomerController extends BaseController {
         WriteSheet writeSheet = EasyExcel.writerSheet("经纪人").build();
         List<AgentsRecommendCustomer> recCustomerExport = null;
         do {
-            recCustomerExport = taRecommendCustomerService.getIndependentAgentsExport(getOrgId(request), pageCode, pageSize);
+            recCustomerExport = taRecommendCustomerService.getIndependentAgentsExport(getOrgId(request), pageCode * pageSize, pageSize);
             excelWriter.write(recCustomerExport, writeSheet);
 
             pageCode ++;
@@ -623,4 +625,99 @@ public class TaRecommendCustomerController extends BaseController {
 
     }
 
+
+
+    // 客户列表 公客/私客
+
+    /**
+     * 导出数据 客户列表 公客/私客
+     * @param request
+     * @param response
+     * @param name
+     * @param tel
+     * @param buildingId
+     * @param consultName
+     * @param consultTel
+     * @param entryType
+     * @param verifyStatus
+     * @param sex
+     * @param customerType
+     * @param status
+     * @throws IOException
+     */
+    @GetMapping("/admin/customer/recommend/export")
+    public void getCustomerExportList (HttpServletRequest request,
+                                         HttpServletResponse response,
+                                         @RequestParam(value ="name",required = false) String name,
+                                         @RequestParam(value ="tel",required = false) String tel,
+                                         @RequestParam(value ="buildingId",required = false) String buildingId,
+                                         @RequestParam(value ="consultName",required = false) String consultName,
+                                         @RequestParam(value ="consultTel",required = false) String consultTel,
+                                         @RequestParam(value ="entryType",required = false) String entryType,
+                                         @RequestParam(value ="verifyStatus",required = false) String verifyStatus,
+                                         @RequestParam(value = "sex",required = false)Integer sex,
+                                         @RequestParam(value = "customerType") String customerType,
+                                         @RequestParam(value = "status",required = false) Integer status) throws IOException { // public 公  private 私
+
+        //        response.setContentType("application/vnd.ms-excel");
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=经纪人.xlsx");
+
+        Integer orgId = getOrgId(request);
+
+        Integer pageCode = 0;
+        Integer pageSize = 100;
+        // 总页数
+        Integer pageCount = 0;
+
+        if (CommConstant.CUTOMER_TYPE_PUBLIC.equals(customerType)) {
+            /**
+             * 公客
+             */
+
+            // 设置读取的class
+            ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), PublicCustomerExport.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+            // 设置 sheet, 同一个sheet只需要设置一次
+            WriteSheet writeSheet = EasyExcel.writerSheet("客户列表-公客").build();
+
+            Integer count = taRecommendCustomerMapper.getPublicCustomerExportListCount(name, tel,  entryType, verifyStatus, sex, orgId,consultTel);
+            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
+            List<PublicCustomerExport> publicList = null;
+            do {
+                publicList = taRecommendCustomerMapper.getPublicCustomerExportList(pageCode * pageSize, pageSize, name, tel,  entryType, verifyStatus, sex, orgId,consultTel);
+                excelWriter.write(publicList, writeSheet);
+
+                pageCode ++;
+            } while (pageCode <= pageCount);
+
+            // finish 会帮忙关闭流
+            excelWriter.finish();
+        } else {
+            /**
+             * 私客
+             */
+
+            // 设置读取的class
+            ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), PrivateCustomerExport.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+            // 设置 sheet, 同一个sheet只需要设置一次
+            WriteSheet writeSheet = EasyExcel.writerSheet("客户列表-私客").build();
+
+            Integer count = taRecommendCustomerMapper.getCustomerExportListCount(buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status);
+            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
+            List<PrivateCustomerExport> privateList = null;
+            do {
+                privateList = taRecommendCustomerMapper.getCustomerExportList(pageCode *  pageSize, pageSize, buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status);
+                excelWriter.write(privateList, writeSheet);
+
+                pageCode ++;
+            } while (pageCode <= pageCount);
+            // finish 会帮忙关闭流
+            excelWriter.finish();
+
+        }
+
+
+    }
+
 }

src/main/java/com/huiju/estateagents/excel/AgentsRecommendCustomer.java

@@ -45,4 +45,18 @@ public class AgentsRecommendCustomer {
     @ExcelProperty(value = "所属渠道", index = 4)
     private String channelName;
 
+    /**
+     * 推荐客户(总数)
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "推荐客户(总数)", index = 5)
+    private String recommedCount;
+
+    /**
+     * 邀请经纪人（数量）
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "邀请经纪人（数量）", index = 6)
+    private String agentCount;
+
 }

src/main/java/com/huiju/estateagents/excel/ExcelRecommendCustomer.java

@@ -43,15 +43,33 @@ public class ExcelRecommendCustomer {
     private String intention;
 
     /**
-     * 置业顾问
+     * 推荐人姓名
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "推荐人", index = 4)
+    @ExcelProperty(value = "推荐人姓名", index = 4)
     private String recommend;
 
+    /**
+     * 推荐人电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "推荐人电话", index = 5)
+    private String recommendTel;
+
     @ColumnWidth(15)
     @DateTimeFormat("yyyy年MM月dd日")
-    @ExcelProperty(value = "推荐时间", index = 5)
+    @ExcelProperty(value = "推荐时间", index = 6)
     private Date createDate;
 
+    /**
+     * 审核状态名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "审核状态名", index = 7)
+    private String verifyStatusName;
+
+
+
+
+
 }

src/main/java/com/huiju/estateagents/excel/PrivateCustomerExport.java

@@ -0,0 +1,48 @@
+package com.huiju.estateagents.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+/**
+ * 公客导出
+ */
+@Data
+public class PrivateCustomerExport {
+
+    /**
+     * 姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "姓名", index = 0)
+    private String name;
+
+    /**
+     * 电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "电话", index = 1)
+    private String phone;
+
+    /**
+     * 性别
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "性别", index = 2)
+    private String sex;
+
+    /**
+     * 置业顾问姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "置业顾问姓名", index = 3)
+    private String consultantName;
+
+    /**
+     * 置业顾问电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "置业顾问电话", index = 4)
+    private String consultTel;
+
+}

src/main/java/com/huiju/estateagents/excel/PublicCustomerExport.java

@@ -0,0 +1,34 @@
+package com.huiju.estateagents.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+/**
+ * 公客导出
+ */
+@Data
+public class PublicCustomerExport {
+
+    /**
+     * 姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "姓名", index = 0)
+    private String nickname;
+
+    /**
+     * 电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "电话", index = 1)
+    private String phone;
+
+    /**
+     * 性别
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "性别", index = 2)
+    private String sex;
+
+}

src/main/java/com/huiju/estateagents/excel/ReporRecommendCustomer.java

@@ -45,14 +45,14 @@ public class ReporRecommendCustomer {
      * 置业顾问
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "置业顾问", index = 25)
+    @ExcelProperty(value = "置业顾问", index = 4)
     private String consultantName;
 
     /**
      * 置业顾问手机号
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "置业顾问手机号", index = 25)
+    @ExcelProperty(value = "置业顾问手机号", index = 5)
     private String consultTel;
 
 }

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

@@ -4,9 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaRecommendCustomer;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huiju.estateagents.excel.AgentsRecommendCustomer;
-import com.huiju.estateagents.excel.ExcelRecommendCustomer;
-import com.huiju.estateagents.excel.ReporRecommendCustomer;
+import com.huiju.estateagents.excel.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -49,46 +47,107 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
     IPage<TaRecommendCustomer> getPublicCustomerList(IPage<TaPerson> page, @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 orgId
      * @return
      */
     List<ExcelRecommendCustomer> getRecCustomerExport(@Param("orgId") Integer orgId, @Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize);
 
     /**
-     * 获取推荐用户数据 总数
+     * 导出数据 获取推荐用户数据 总数
      * @param orgId
      * @return
      */
     Integer getRecCustomerExportCount(@Param("orgId") Integer orgId);
 
     /**
-     * 获取报备客户数据 总数
+     * 导出数据 获取报备客户数据 总数
      * @param orgId
      * @return
      */
     Integer getRepCustomerReportCount(@Param("orgId")Integer orgId);
 
     /**
-     * 获取报备客户数据
+     * 导出数据 获取报备客户数据
      * @param orgId
      * @return
      */
     List<ReporRecommendCustomer> getRepCustomerReportExport(@Param("orgId") Integer orgId, @Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize);
 
     /**
-     * 获取经纪人数据 总数
+     * 导出数据 获取经纪人数据 总数
      * @param orgId
      * @return
      */
     Integer getIndependentAgentsCount(@Param("orgId") Integer orgId);
 
     /**
-     * 获取经纪人数据
+     * 导出数据 获取经纪人数据
      * @param orgId
      * @param pageCode
      * @param pageSize
      * @return
      */
     List<AgentsRecommendCustomer> getIndependentAgentsExport(@Param("orgId") Integer orgId, @Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize);
+
+    /**
+     * 导出数据 公客总数
+     * @param name
+     * @param tel
+     * @param entryType
+     * @param verifyStatus
+     * @param sex
+     * @param orgId
+     * @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);
+
+    /**
+     * 导出数据 公客
+     * @param name
+     * @param tel
+     * @param entryType
+     * @param verifyStatus
+     * @param sex
+     * @param orgId
+     * @param consultTel
+     * @return
+     */
+    List<PublicCustomerExport> getPublicCustomerExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @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 buildingId
+     * @param name
+     * @param tel
+     * @param consultName
+     * @param consultTel
+     * @param entryType
+     * @param verifyStatus
+     * @param sex
+     * @param orgId
+     * @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 pageCode
+     * @param pageSize
+     * @param buildingId
+     * @param name
+     * @param tel
+     * @param consultName
+     * @param consultTel
+     * @param entryType
+     * @param verifyStatus
+     * @param sex
+     * @param orgId
+     * @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);
+
 }

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

@@ -26,7 +26,7 @@ public interface ITaNewsService extends IService<TaNews> {
      * @param newsTypeId
      * @return
      */
-    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus);
+    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus,String title);
 
     /**
      * 根据Id查询资讯数据

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

@@ -58,7 +58,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
 
 
     @Override
-    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus) {
+    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus,String title) {
         ResponseBean responseBean = new ResponseBean();
 
         IPage<TaNews> page = new Page<>();
@@ -71,6 +71,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
         taNewsQueryWrapper.eq(newsTypeId != null,"news_type_id", newsTypeId);
         taNewsQueryWrapper.eq(newsStatus != null, "news_status", newsStatus);
         taNewsQueryWrapper.eq("status", 1);
+        taNewsQueryWrapper.like(title!=null,"news_name", title);
         taNewsQueryWrapper.orderByDesc("create_date");
         IPage<TaNews> taNewsIPage = this.page(page, taNewsQueryWrapper);
 

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

@@ -186,7 +186,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         taRecommendCustomer.setDemandType(params.getString("demandType"));
         taRecommendCustomer.setPriceRange(params.getString("priceRange"));
         taRecommendCustomer.setEntryType(CommConstant.ENTRY_INPUT);
-        taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_READY);
+        // taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_READY);
 
 
         String status = params.getString("status");

src/main/resources/mapper/TaBuildingDynamicMapper.xml

@@ -31,7 +31,7 @@
             and city_id = #{cityId}
         </if>
         <if test="title != null and title != ''">
-            and title = #{title}
+            and title like CONCAT('%', #{title} , '%')
         </if>
         <if test="orgId != null and orgId != ''">
             and org_id = #{orgId}

src/main/resources/mapper/TaPersonMapper.xml

@@ -503,12 +503,8 @@ FROM
 
     <select id="channelBrokerList" resultType="com.huiju.estateagents.entity.TaPerson">
         select
-        p.person_id,
-        p.avatarurl,
-        p.sex,
-        rc.`name` as name,
-        rc.phone as tel,
-        COUNT(rc.person_id) as recommendCount
+        p.*,
+        COUNT(rc.person_id) AS recommendCount
         from ta_channel_person tch
         left join  ta_person p on  tch.person_id = p.person_id
         LEFT JOIN ta_recommend_customer rc ON p.person_id = rc.person_id

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -240,7 +240,9 @@ FROM
         a.intention as intention,
         a.create_date as createDate,
         if(a.sex = 1, '男',if(a.sex = 2, '女', '未知')) as sex,
-        concat(c.nickname, c.phone) as recommend
+        c.nickname as recommend,
+        c.phone as recommendTel,
+        if(a.verify_status = 0, '未通过', if(a.verify_status = 1, '已通过', if(a.verify_status = 2, '已驳回', ''))) as verifyStatusName
         FROM
         ta_recommend_customer a
         LEFT JOIN ta_person c on a.recommend_person = c.person_id
@@ -333,13 +335,31 @@ FROM
         a.phone as phone,
         if(a.gender = '1', '男', if(a.gender = '2', '女', '未知')) as gender,
         if(ifnull(tc.channel_name, '') != '', '渠道经纪人', '独立经纪人') as personType,
-        tc.channel_name  as channelName
+        tc.channel_name  as channelName,
+        (
+            SELECT
+              count( 1 )
+            FROM
+              ta_recommend_customer tarc
+            LEFT JOIN ta_person tp ON tarc.recommend_person = tp.person_id
+            WHERE
+              tarc.recommend_person = a.person_id and ifnull(tp.person_type, '') = 'customer'
+        ) AS recommedCount,
+        (
+            SELECT
+              count( 1 )
+            FROM
+              ta_recommend_customer tarc
+            LEFT JOIN ta_person tp ON tarc.recommend_person = tp.person_id
+            WHERE
+              tarc.recommend_person = a.person_id and ifnull(tp.person_type, '') in ('channel agent', 'estate agent')
+        ) AS agentCount
         FROM
         ta_person a
         left join ta_channel_person tcp on a.person_id = tcp.person_id
         left join ta_channel tc on tc.channel_id = tcp.channel_id
         <where>
-            a.person_type = 'estate agent'
+            ifnull(a.person_type, '') in ('channel agent', 'estate agent')
             and a.status >0
             <if test="orgId != null">
                 and a.org_id = #{orgId}
@@ -349,6 +369,167 @@ FROM
 
         ORDER BY
         a.create_date DESC
+        limit #{pageCode}, #{pageSize}
+    </select>
+
+
+    <select id="getPublicCustomerExportListCount" resultType="Integer">
+        SELECT
+        count(1)
+        FROM
+        ta_person b
+        <where>
+            b.status > 0
+            AND IFNULL(b.person_type, '') in ('estate agent', 'customer')
+            <if test="name != null and name !=''">
+                and b.nickname like CONCAT('%',#{name}, '%')
+            </if>
+            <if test="tel != null and tel!=''">
+                and b.phone like CONCAT('%',#{tel}, '%')
+            </if>
+            <if test="entryType != null and entryType !=''">
+                and b.entry_type = #{entryType}
+            </if>
+            <if test="sex != null and sex !=''">
+                and b.sex = #{sex}
+            </if>
+            <if test="orgId != null">
+                and b.org_id = #{orgId}
+            </if>
+            <if test="consultTel != null and consultTel !=''">
+                and b.tel like CONCAT('%',#{consultTel}, '%')
+            </if>
+            and NOT EXISTS ( select * from ta_recommend_customer a where a.recommend_person = b.person_id)
+        </where>
+        order by b.create_date desc
+    </select>
+
+    <select id="getPublicCustomerExportList" resultType="com.huiju.estateagents.excel.PublicCustomerExport">
+        SELECT
+          b.nickname as nickname,
+          b.phone as phone,
+          if(b.sex = 1, '男', if(b.sex = 2, '女', '未知')) as sex
+        FROM
+        ta_person b
+        <where>
+            b.status > 0
+            AND IFNULL(b.person_type, '') in ('estate agent', 'customer')
+            <if test="name != null and name !=''">
+                and b.nickname like CONCAT('%',#{name}, '%')
+            </if>
+            <if test="tel != null and tel!=''">
+                and b.phone like CONCAT('%',#{tel}, '%')
+            </if>
+            <if test="entryType != null and entryType !=''">
+                and b.entry_type = #{entryType}
+            </if>
+            <if test="sex != null and sex !=''">
+                and b.sex = #{sex}
+            </if>
+            <if test="orgId != null">
+                and b.org_id = #{orgId}
+            </if>
+            <if test="consultTel != null and consultTel !=''">
+                and b.tel like CONCAT('%',#{consultTel}, '%')
+            </if>
+            and NOT EXISTS ( select * from ta_recommend_customer a where a.recommend_person = b.person_id)
+        </where>
+        order by b.create_date desc
+        limit #{pageCode}, #{pageSize}
+    </select>
+
+    <select id="getCustomerExportListCount" resultType="Integer" >
+        SELECT
+            count(1)
+        FROM
+        ta_recommend_customer a
+        LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
+        LEFT JOIN ta_person c on a.recommend_person = c.person_id
+        <where>
+            a.status > 0
+            and realty_consultant is not null
+            <if test="orgId != null">
+                and a.org_id = #{orgId}
+            </if>
+            <if test="building != null and building !=''">
+                and a.building_id = #{building}
+            </if>
+            <if test="name != null and name !=''">
+                and a.name like CONCAT('%',#{name}, '%')
+            </if>
+            <if test="tel != null and tel!=''">
+                and a.phone like CONCAT('%',#{tel}, '%')
+            </if>
+            <if test="consultName != null and consultName !=''">
+                and b.name like CONCAT('%',#{consultName}, '%')
+            </if>
+            <if test="consultTel != null and consultTel !=''">
+                and b.tel like CONCAT('%',#{consultTel}, '%')
+            </if>
+            <if test="entryType != null and entryType !=''">
+                and a.entry_type = #{entryType}
+            </if>
+            <if test="verifyStatus != null and verifyStatus !=''">
+                and a.verify_status = #{verifyStatus}
+            </if>
+            <if test="status != null and status !=''">
+                and a.status = #{status}
+            </if>
+            <if test="sex != null and sex !=''">
+                and a.sex = #{sex}
+            </if>
+        </where>
+        order by a.create_date desc
+    </select>
+
+
+    <select id="getCustomerExportList" resultType="com.huiju.estateagents.excel.PrivateCustomerExport">
+        SELECT
+        a.name AS name,
+        a.phone as phone,
+        if(a.sex = 1, '男', if(a.sex = 2, '女', '未知')) as sex,
+        b.name as consultantName,
+        b.tel as consultTel
+        FROM
+        ta_recommend_customer a
+        LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
+        LEFT JOIN ta_person c on a.recommend_person = c.person_id
+        <where>
+            a.status > 0
+            and realty_consultant is not null
+            <if test="orgId != null">
+                and a.org_id = #{orgId}
+            </if>
+            <if test="building != null and building !=''">
+                and a.building_id = #{building}
+            </if>
+            <if test="name != null and name !=''">
+                and a.name like CONCAT('%',#{name}, '%')
+            </if>
+            <if test="tel != null and tel!=''">
+                and a.phone like CONCAT('%',#{tel}, '%')
+            </if>
+            <if test="consultName != null and consultName !=''">
+                and b.name like CONCAT('%',#{consultName}, '%')
+            </if>
+            <if test="consultTel != null and consultTel !=''">
+                and b.tel like CONCAT('%',#{consultTel}, '%')
+            </if>
+            <if test="entryType != null and entryType !=''">
+                and a.entry_type = #{entryType}
+            </if>
+            <if test="verifyStatus != null and verifyStatus !=''">
+                and a.verify_status = #{verifyStatus}
+            </if>
+            <if test="status != null and status !=''">
+                and a.status = #{status}
+            </if>
+            <if test="sex != null and sex !=''">
+                and a.sex = #{sex}
+            </if>
+        </where>
+        order by a.create_date desc
+        limit #{pageCode}, #{pageSize}
     </select>
 
 </mapper>