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

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

@@ -781,7 +781,10 @@ public class TaRecommendCustomerController extends BaseController {
      * 导出数据(经纪人)
      */
     @GetMapping("/admin/customer/recommend/agents/export")
-    public void agentsExport(HttpServletRequest request, HttpServletResponse response) throws IOException {
+    public void agentsExport(@RequestParam(value = "name", required = false) String name,
+                             @RequestParam(value = "tel", required = false) String tel,
+                             @RequestParam(value = "channelId", required = false) String channelId,
+                             HttpServletRequest request, HttpServletResponse response) throws IOException {
 //        response.setContentType("application/vnd.ms-excel");
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");
@@ -799,7 +802,7 @@ public class TaRecommendCustomerController extends BaseController {
         WriteSheet writeSheet = EasyExcel.writerSheet("经纪人").build();
         List<AgentsRecommendCustomer> recCustomerExport = null;
         do {
-            recCustomerExport = taRecommendCustomerService.getIndependentAgentsExport(getOrgId(request), pageCode * pageSize, pageSize);
+            recCustomerExport = taRecommendCustomerService.getIndependentAgentsExport(name, tel, channelId, getOrgId(request), pageCode * pageSize, pageSize);
             excelWriter.write(recCustomerExport, writeSheet);
 
             pageCode++;

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

@@ -107,7 +107,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param pageSize
      * @return
      */
-    List<AgentsRecommendCustomer> getIndependentAgentsExport(@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);
 
     /**
      * 导出数据 公客总数

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

@@ -111,7 +111,7 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
      * @param pageSize
      * @return
      */
-    List<AgentsRecommendCustomer> getIndependentAgentsExport(Integer orgId, Integer pageCode, Integer pageSize);
+    List<AgentsRecommendCustomer> getIndependentAgentsExport(String name, String tel, String channelId, Integer orgId, Integer pageCode, Integer pageSize);
 
     /**
      * 查询我的客户人数集合

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

@@ -982,7 +982,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
 
 
             TaRecommendCustomer customer = copyByPerosn(person, new TaRecommendCustomer());
-            customer.setVerifyStatus(CommConstant.VERIFY_READY);
+            customer.setVerifyStatus(CommConstant.VERIFY_AGREE);
             customer.setStatus(CommConstant.CUSTOMER_REPORT);
             customer.setEntryType(CommConstant.ENTRY_INPUT);
             customer.setCreateDate(now);

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

@@ -931,8 +931,8 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public List<AgentsRecommendCustomer> getIndependentAgentsExport(Integer orgId, Integer pageCode, Integer pageSize) {
-        return taRecommendCustomerMapper.getIndependentAgentsExport(orgId, pageCode, pageSize);
+    public List<AgentsRecommendCustomer> getIndependentAgentsExport(String name, String tel, String channelId, Integer orgId, Integer pageCode, Integer pageSize) {
+        return taRecommendCustomerMapper.getIndependentAgentsExport(name, tel, channelId, orgId, pageCode, pageSize);
     }
 
     /**

src/main/resources/mapper/TaChannelMapper.xml

@@ -31,13 +31,14 @@
     <select id="pageTaChannel" resultType="com.huiju.estateagents.entity.TaChannel">
         SELECT
         c.*,
-        (select count(*) AS brokerCount from ta_person a where a.person_id = cp.person_id) AS brokerCount,
+        count(tp.person_id) AS brokerCount,
         COUNT(rc.recommend_person) AS recommendCount,
         (SELECT COUNT(p.recommend_agent ) from ta_person p WHERE cp.person_id = p.recommend_agent) AS inviteCount,
         cp.person_id
         FROM
         ta_channel c
         LEFT JOIN ta_channel_person cp ON c.channel_id = cp.channel_id
+        LEFT JOIN ta_person tp on cp.person_id = tp.person_id and tp.person_type = 'estate agent'
         LEFT JOIN ta_recommend_customer rc ON cp.person_id = rc.recommend_person and rc.verify_status = 1 and rc.`status` = 1
         <where>
             <if test="channelId != null and channelId != ''">

src/main/resources/mapper/TaPersonMapper.xml

@@ -520,7 +520,7 @@ FROM
         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_person p on  tch.person_id = p.person_id and p.person_type = 'estate agent'
         LEFT JOIN ta_recommend_customer rc ON p.person_id = rc.person_id
         <where>
         <if test="name !=null and name !=''">

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -493,7 +493,7 @@ FROM
         a.nickname as nickname,
         a.phone as phone,
         if(a.gender = '1', '男', if(a.gender = '2', '女', '未知')) as gender,
-        if(ifnull(tc.channel_name, '') != '', '渠道经纪人', '独立经纪人') as personType,
+        '专业经纪人' as personType,
         tc.channel_name as channelName,
         (
         SELECT
@@ -523,6 +523,15 @@ FROM
             <if test="orgId != null">
                 and a.org_id = #{orgId}
             </if>
+            <if test="name != null and name != ''">
+                and a.nickname like concat('%', #{orgId}, '%')
+            </if>
+            <if test="tel != null and tel != null">
+                and a.phone like concat('%', #{tel}, '%')
+            </if>
+            <if test="channelId != null and channelId != ''">
+                and tc.channel_id = #{channelId}
+            </if>
 
         </where>