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

pom.xml

@@ -108,6 +108,14 @@
 			<artifactId>guava</artifactId>
 			<version>26.0-jre</version>
 		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/com.alibaba/easyexcel -->
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>easyexcel</artifactId>
+			<version>2.0.4</version>
+		</dependency>
+
 	</dependencies>
 
 	<profiles>

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

@@ -1,6 +1,9 @@
 package com.huiju.estateagents.controller;
 
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -13,6 +16,10 @@ 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.handler.CustomCellWriteHandler;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaRecommendCustomerService;
 import com.huiju.estateagents.service.TaChannelPersonService;
@@ -25,7 +32,10 @@ import com.huiju.estateagents.base.BaseController;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -491,4 +501,104 @@ public class TaRecommendCustomerController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 导出数据(推荐客户列表)
+     */
+    @GetMapping("/admin/customer/recommend/recommender/export")
+    public void export(HttpServletRequest request, HttpServletResponse response) throws IOException {
+//        response.setContentType("application/vnd.ms-excel");
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=推荐客户.xlsx");
+
+        Integer count = taRecommendCustomerService.getRecCustomerExportCount(getOrgId(request));
+
+        Integer pageCode = 1;
+        Integer pageSize = 100;
+        // 总页数
+        Integer pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
+        // 设置读取的class
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ExcelRecommendCustomer.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        // 设置 sheet, 同一个sheet只需要设置一次
+        WriteSheet writeSheet = EasyExcel.writerSheet("推荐客户").build();
+        List<ExcelRecommendCustomer> recCustomerExport = null;
+        do {
+            recCustomerExport = taRecommendCustomerService.getRecCustomerExport(getOrgId(request), pageCode, pageSize);
+            excelWriter.write(recCustomerExport, writeSheet);
+
+            pageCode ++;
+        } while (pageCode <= pageCount);
+
+        /// finish 会帮忙关闭流
+        excelWriter.finish();
+
+    }
+
+
+    /**
+     * 导出数据(报备客户)
+     */
+    @GetMapping("/admin/customer/recommend/report/export")
+    public void reportExport(HttpServletRequest request, HttpServletResponse response) throws IOException {
+//        response.setContentType("application/vnd.ms-excel");
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=报备客户.xlsx");
+
+        Integer count = taRecommendCustomerService.getRepCustomerReportCount(getOrgId(request));
+
+        Integer pageCode = 1;
+        Integer pageSize = 100;
+        // 总页数
+        Integer pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
+        // 设置读取的class
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ExcelRecommendCustomer.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        // 设置 sheet, 同一个sheet只需要设置一次
+        WriteSheet writeSheet = EasyExcel.writerSheet("报备客户").build();
+        List<ReporRecommendCustomer> recCustomerExport = null;
+        do {
+            recCustomerExport = taRecommendCustomerService.getRepCustomerReportExport(getOrgId(request), pageCode, pageSize);
+            excelWriter.write(recCustomerExport, writeSheet);
+
+            pageCode ++;
+        } while (pageCode <= pageCount);
+
+        /// finish 会帮忙关闭流
+        excelWriter.finish();
+
+    }
+
+    /**
+     * 导出数据(经纪人)
+     */
+    @GetMapping("/admin/customer/recommend/agents/export")
+    public void agentsExport(HttpServletRequest request, HttpServletResponse response) throws IOException {
+//        response.setContentType("application/vnd.ms-excel");
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=经纪人.xlsx");
+
+        Integer count = taRecommendCustomerService.getIndependentAgentsCount(getOrgId(request));
+
+        Integer pageCode = 1;
+        Integer pageSize = 100;
+        // 总页数
+        Integer pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
+        // 设置读取的class
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ExcelRecommendCustomer.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        // 设置 sheet, 同一个sheet只需要设置一次
+        WriteSheet writeSheet = EasyExcel.writerSheet("经纪人").build();
+        List<AgentsRecommendCustomer> recCustomerExport = null;
+        do {
+            recCustomerExport = taRecommendCustomerService.getIndependentAgentsExport(getOrgId(request), pageCode, pageSize);
+            excelWriter.write(recCustomerExport, writeSheet);
+
+            pageCode ++;
+        } while (pageCode <= pageCount);
+
+        /// finish 会帮忙关闭流
+        excelWriter.finish();
+
+    }
+
 }

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

@@ -5,6 +5,8 @@ import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -36,7 +38,6 @@ public class TaRecommendCustomer implements Serializable {
     /**
      * 姓名
      */
-
     @TableField(value = "`name`")
     private String name;
 
@@ -74,6 +75,7 @@ public class TaRecommendCustomer implements Serializable {
     /**
      * 意向项目
      */
+    @ExcelProperty(value = "意向项目", index = 3)
     private String intention;
 
     /**
@@ -143,6 +145,7 @@ public class TaRecommendCustomer implements Serializable {
 
     private String entryType;
 
+    @DateTimeFormat("yyyy年MM月dd日")
     private LocalDateTime createDate;
 
     private Integer reportRecommendStatus;

src/main/java/com/huiju/estateagents/excel/AgentsRecommendCustomer.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 AgentsRecommendCustomer {
+
+    /**
+     * 姓名
+     */
+    @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 gender;
+
+    /**
+     * 类型
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "类型", index = 3)
+    private String personType;
+
+    /**
+     * 所属渠道
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "所属渠道", index = 4)
+    private String channelName;
+
+}

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

@@ -0,0 +1,57 @@
+package com.huiju.estateagents.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * 推荐客户
+ */
+@Data
+public class ExcelRecommendCustomer {
+
+    /**
+     * 姓名
+     */
+    @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 intention;
+
+    /**
+     * 置业顾问
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "推荐人", index = 4)
+    private String recommend;
+
+    @ColumnWidth(15)
+    @DateTimeFormat("yyyy年MM月dd日")
+    @ExcelProperty(value = "推荐时间", index = 5)
+    private Date createDate;
+
+}

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

@@ -0,0 +1,58 @@
+package com.huiju.estateagents.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 报备客户
+ */
+@Data
+public class ReporRecommendCustomer {
+
+    /**
+     * 姓名
+     */
+    @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 intention;
+
+    /**
+     * 置业顾问
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "置业顾问", index = 25)
+    private String consultantName;
+
+    /**
+     * 置业顾问手机号
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "置业顾问手机号", index = 25)
+    private String consultTel;
+
+}

src/main/java/com/huiju/estateagents/excel/handler/CustomCellWriteHandler.java

@@ -0,0 +1,34 @@
+package com.huiju.estateagents.excel.handler;
+
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.Head;
+import com.alibaba.excel.write.handler.CellWriteHandler;
+import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
+import com.alibaba.excel.write.metadata.holder.WriteTableHolder;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+
+/**
+ * excel 转换器
+ */
+@Slf4j
+public class CustomCellWriteHandler implements CellWriteHandler {
+
+    @Override
+    public void beforeCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Row row, Head head, int relativeRowIndex, boolean isHead) {
+
+    }
+
+    @Override
+    public void afterCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, CellData cellData, Cell cell, Head head, int relativeRowIndex, boolean isHead) {
+
+//        // 这里可以对cell进行任何操作
+//        log.info("第{}行，第{}列写入前拦截。", cell.getRowIndex(), cell.getColumnIndex());
+//        if (isHead && cell.getColumnIndex() == 2) {
+//            String currentCellValue = cell.getStringCellValue();
+//            String value = "1".equals(currentCellValue) ? "男" : "0".equals(currentCellValue) ? "女" : "未知";
+//            cell.setCellValue(value);
+//        }
+    }
+}

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

@@ -4,9 +4,14 @@ 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 org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 推荐客户表 Mapper 接口
@@ -42,4 +47,48 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @return
      */
     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 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);
 }

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

@@ -5,6 +5,11 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaRecommendCustomer;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.excel.AgentsRecommendCustomer;
+import com.huiju.estateagents.excel.ExcelRecommendCustomer;
+import com.huiju.estateagents.excel.ReporRecommendCustomer;
+
+import java.util.List;
 
 /**
  * <p>
@@ -44,4 +49,51 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
     IPage<TaRecommendCustomer>getCustomersIRecommended(int pageNumber, int pageSize,String customerId,Integer orgId);
 
     TaRecommendCustomer newByPerson(TaPerson person);
+
+    /**
+     * 导出数据(推荐客户)
+     * @param orgId
+     * @return
+     */
+    List<ExcelRecommendCustomer> getRecCustomerExport(Integer orgId, Integer pageCode, Integer pageSize);
+
+    /**
+     * 导出数据(推荐客户) 总数
+     * @param orgId
+     * @return
+     */
+    Integer getRecCustomerExportCount(Integer orgId);
+
+    /**
+     * 导出数据(报备客户) 总数
+     * @param orgId
+     * @return
+     */
+    Integer getRepCustomerReportCount(Integer orgId);
+
+    /**
+     * 导出数据(报备客户)
+     * @param orgId
+     * @param pageCode
+     * @param pageSize
+     * @return
+     */
+    List<ReporRecommendCustomer> getRepCustomerReportExport(Integer orgId, Integer pageCode, Integer pageSize);
+
+    /**
+     * 导出数据(经纪人) 总数
+     * @param orgId
+     * @return
+     */
+    Integer getIndependentAgentsCount(Integer orgId);
+
+    /**
+     * 导出数据(经纪人)
+     * @param orgId
+     * @param pageCode
+     * @param pageSize
+     * @return
+     */
+    List<AgentsRecommendCustomer> getIndependentAgentsExport(Integer orgId, Integer pageCode, Integer pageSize);
+
 }

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

@@ -12,6 +12,9 @@ import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaRecommendCustomer;
+import com.huiju.estateagents.excel.AgentsRecommendCustomer;
+import com.huiju.estateagents.excel.ExcelRecommendCustomer;
+import com.huiju.estateagents.excel.ReporRecommendCustomer;
 import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.mapper.TaPersonVisitRecordMapper;
 import com.huiju.estateagents.mapper.TaRecommendCustomerMapper;
@@ -458,4 +461,37 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
             return 0;
         }
     }
+
+
+    @Override
+    public List<ExcelRecommendCustomer> getRecCustomerExport(Integer orgId, Integer pageCode, Integer pageSize) {
+        return taRecommendCustomerMapper.getRecCustomerExport(orgId, pageCode, pageSize);
+    }
+
+    @Override
+    public Integer getRecCustomerExportCount(Integer orgId) {
+        return taRecommendCustomerMapper.getRecCustomerExportCount(orgId);
+    }
+
+
+    @Override
+    public Integer getRepCustomerReportCount(Integer orgId) {
+        return taRecommendCustomerMapper.getRepCustomerReportCount(orgId);
+    }
+
+    @Override
+    public List<ReporRecommendCustomer> getRepCustomerReportExport(Integer orgId, Integer pageCode, Integer pageSize) {
+        return taRecommendCustomerMapper.getRepCustomerReportExport(orgId, pageCode, pageSize);
+    }
+
+
+    @Override
+    public Integer getIndependentAgentsCount(Integer orgId) {
+        return taRecommendCustomerMapper.getIndependentAgentsCount(orgId);
+    }
+
+    @Override
+    public List<AgentsRecommendCustomer> getIndependentAgentsExport(Integer orgId, Integer pageCode, Integer pageSize) {
+        return taRecommendCustomerMapper.getIndependentAgentsExport(orgId, pageCode, pageSize);
+    }
 }

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

@@ -54,19 +54,19 @@ public class TaRoleServiceImpl extends ServiceImpl<TaRoleMapper, TaRole> impleme
             SysMenu sysMenu = sysMenuMapper.selectById(taRoleMenu.getMenuId());
             sysMenuList.add(sysMenu);
 
-            // 查询按钮
-            QueryWrapper<TaRoleButton> taRoleButtonQuery= new QueryWrapper<>();
-            taRoleButtonQuery.eq("role_id",id);
-            List<TaRoleButton> taRoleButtonList= taRoleButtonMapper.selectList(taRoleButtonQuery);
-            List<SysButtonInMenu> sysButtonInArr = new ArrayList<>();
-            for(TaRoleButton taRoleButton :taRoleButtonList){
-                QueryWrapper<SysButtonInMenu> sysButtonInMenuQuery = new QueryWrapper<>();
-                sysButtonInMenuQuery.eq("btn_id",taRoleButton.getBtnId());
-                SysButtonInMenu sysButtonInMenuList= sysButtonInMenuMapper.selectOne(sysButtonInMenuQuery);
-                sysButtonInArr.add(sysButtonInMenuList);
-            }
-            sysMenu.setSysButtonInMenu(sysButtonInArr);
         }
+        // 查询按钮
+        QueryWrapper<TaRoleButton> taRoleButtonQuery= new QueryWrapper<>();
+        taRoleButtonQuery.eq("role_id",id);
+        List<TaRoleButton> taRoleButtonList= taRoleButtonMapper.selectList(taRoleButtonQuery);
+        List<SysButtonInMenu> sysButtonInArr = new ArrayList<>();
+        for(TaRoleButton taRoleButton :taRoleButtonList){
+            QueryWrapper<SysButtonInMenu> sysButtonInMenuQuery = new QueryWrapper<>();
+            sysButtonInMenuQuery.eq("btn_id",taRoleButton.getBtnId());
+            SysButtonInMenu sysButtonInMenuList= sysButtonInMenuMapper.selectOne(sysButtonInMenuQuery);
+            sysButtonInArr.add(sysButtonInMenuList);
+        }
+        taRole.setSysButtonInMenu(sysButtonInArr);
         taRole.setSysMenuList(sysMenuList);
         return taRole;
     }

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -226,4 +226,123 @@ FROM
         </where>
         order by b.create_date desc
     </select>
+
+    <select id="getRecCustomerExport" resultType="com.huiju.estateagents.excel.ExcelRecommendCustomer">
+        SELECT
+        a.name as name,
+        a.phone as phone,
+        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
+        FROM
+        ta_recommend_customer a
+        LEFT JOIN ta_person c on a.recommend_person = c.person_id
+        <where>
+            a.status > 0
+            and a.report_recommend_status = 2
+            <if test="orgId != null">
+                and a.org_id = #{orgId}
+            </if>
+        </where>
+        order by a.create_date desc
+        limit #{pageCode}, #{pageSize}
+    </select>
+
+    <select id="getRecCustomerExportCount" resultType="java.lang.Integer">
+        SELECT
+        count(*)
+        FROM
+        ta_recommend_customer a
+        LEFT JOIN ta_person c on a.recommend_person = c.person_id
+        <where>
+            a.status > 0
+            and a.report_recommend_status = 2
+            <if test="orgId != null">
+                and a.org_id = #{orgId}
+            </if>
+        </where>
+    </select>
+
+    <select id="getRepCustomerReportCount" resultType="java.lang.Integer">
+        SELECT
+        count(*)
+        FROM
+        ta_recommend_customer a
+        LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
+        <where>
+            a.status > 0
+            and a.report_recommend_status = 1
+            <if test="orgId != null">
+                and a.org_id = #{orgId}
+            </if>
+        </where>
+    </select>
+
+    <select id="getRepCustomerReportExport" resultType="com.huiju.estateagents.excel.ReporRecommendCustomer" >
+        SELECT
+        a.name as name,
+        a.phone as phone,
+        a.intention as intention,
+        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
+        <where>
+            a.status > 0
+            and a.report_recommend_status = 1
+            <if test="orgId != null">
+                and a.org_id = #{orgId}
+            </if>
+        </where>
+        order by a.create_date desc
+        limit #{pageCode}, #{pageSize}
+    </select>
+
+
+    <select id="getIndependentAgentsCount"  resultType="java.lang.Integer">
+        SELECT
+        count(*)
+        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'
+            and a.status >0
+            <if test="orgId != null">
+                and a.org_id = #{orgId}
+            </if>
+        </where>
+
+        ORDER BY
+        create_date DESC
+    </select>
+
+    <select id="getIndependentAgentsExport" resultType="com.huiju.estateagents.excel.AgentsRecommendCustomer">
+        SELECT
+        a.nickname as nickname,
+        a.phone as phone,
+        if(a.gender = '1', '男', if(a.gender = '2', '女', '未知')) as gender,
+        a.personType as personType,
+        if(ifnull(tc.channel_name, '') != '', '渠道经纪人', '独立经纪人')  as channelName
+        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'
+            and a.status >0
+            <if test="orgId != null">
+                and a.org_id = #{orgId}
+            </if>
+
+        </where>
+
+        ORDER BY
+        a.create_date DESC
+    </select>
+
 </mapper>