经纪人我的客户

src/main/java/com/yunzhi/marketing/mapper/TaRecommendCustomerMapper.java

@@ -251,7 +251,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
 
     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<TaRecommendCustomerPO> getCustomersIRecommended(IPage<TaRecommendCustomerPO> page, @Param("customerId") String customerId, @Param("status") Integer status, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
     /**
      * @param page

src/main/java/com/yunzhi/marketing/service/ITaRecommendCustomerService.java

@@ -10,6 +10,7 @@ import com.yunzhi.marketing.excel.AgentsRecommendCustomer;
 import com.yunzhi.marketing.excel.ExcelRecommendCustomer;
 import com.yunzhi.marketing.excel.ReporRecommendCustomer;
 import com.yunzhi.marketing.entity.*;
+import com.yunzhi.marketing.po.TaRecommendCustomerPO;
 
 import java.util.List;
 
@@ -53,7 +54,7 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     TaRecommendCustomer getCustomerById(String customerId);
 
-    IPage<TaRecommendCustomer> getCustomersIRecommended(int pageNumber, int pageSize, String customerId, Integer orgId, List<TaPersonBuilding> taPersonBuildingList);
+    IPage<TaRecommendCustomerPO> getCustomersIRecommended(int pageNumber, int pageSize, String customerId, Integer orgId, List<TaPersonBuilding> taPersonBuildingList);
 
     TaRecommendCustomer newByPerson(TaPerson person);
 

src/main/java/com/yunzhi/marketing/service/impl/TaRecommendCustomerServiceImpl.java

@@ -1327,12 +1327,12 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public IPage<TaRecommendCustomer> getCustomersIRecommended(int pageNumber, int pageSize, String customerId, Integer orgId, List<TaPersonBuilding> taPersonBuildingList) {
+    public IPage<TaRecommendCustomerPO> getCustomersIRecommended(int pageNumber, int pageSize, String customerId, Integer orgId, List<TaPersonBuilding> taPersonBuildingList) {
 
-        QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
+//        QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
         // todo
         // 此处可能不是 person_id 而是 recommend_person
-        IPage<TaRecommendCustomer> page = new Page<>(pageNumber, pageSize);
+        IPage<TaRecommendCustomerPO> page = new Page<>(pageNumber, pageSize);
 //        queryWrapper.eq("recommend_person",customerId);
 ////        queryWrapper.eq("building_id",building);
 //        queryWrapper.eq("status", CommConstant.VERIFY_AGREE);

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -862,8 +862,19 @@ FROM
         intention DESC
     </select>
 
-    <select id="getCustomersIRecommended" resultType="com.yunzhi.marketing.entity.TaRecommendCustomer">
-        select a.*,b.avatarurl from ta_recommend_customer a left join ta_person b on a.person_id = b.person_id
+    <select id="getCustomersIRecommended" resultType="com.yunzhi.marketing.po.TaRecommendCustomerPO">
+        select a.customer_id AS id,
+        a.NAME,
+        a.phone,
+        a.picture,
+        a.sex,
+        "customer" AS type,
+        a.building_id AS buildingId,
+        a.realty_consultant AS consultant,
+        a.STATUS AS customerStatus,
+        NULL AS channelStatus,
+        b.avatarurl
+        from ta_recommend_customer a left join ta_person b on a.person_id = b.person_id
         where a.recommend_person = #{customerId}
         and a.status &gt;= #{status}
         and a.org_id = #{orgId}
@@ -873,6 +884,31 @@ FROM
                 #{personBuilding.buildingId}
             </foreach>
         </if>
+        union all
+        SELECT
+        a.channel_customer_id AS id,
+        a.NAME,
+        a.phone,
+        a.picture,
+        a.sex,
+        "report" AS type,
+        NULL AS buildingId,
+        NULL AS consultant,
+        NULL AS customerStatus,
+        a.STATUS AS channelStatus,
+        b.avatarurl
+        FROM
+        xlk_channel_customer a
+        LEFT JOIN ta_person b ON a.person_id = b.person_id
+        where a.recommend_person = #{customerId}
+        and a.status = #{status}
+        and a.org_id = #{orgId}
+        <if test="personBuildingList != null and personBuildingList.size > 0">
+            AND a.building_id in
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                #{personBuilding.buildingId}
+            </foreach>
+        </if>
     </select>
 
     <select id="getCustomerListOfConsultant" resultType="com.yunzhi.marketing.entity.TaRecommendCustomer">