调整

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

@@ -306,7 +306,8 @@ public class TaRecommendCustomerController extends BaseController {
                                          @RequestParam(value ="verifyStatus",required = false) String verifyStatus,
                                          @RequestParam(value = "sex",required = false)Integer sex,
                                          @RequestParam(value = "customerType") String customerType,// public 公  private 私
-                                         @RequestParam(value = "status",required = false) Integer status){
+                                         @RequestParam(value = "status",required = false) Integer status,
+                                         @RequestParam(value = "sceneType",required = false) String sceneType){
         try{
 
             // TODO 目前如果是公客，就取当前操作人员的 buildingId
@@ -320,7 +321,7 @@ public class TaRecommendCustomerController extends BaseController {
 //                TaPersonBuilding personBuilding = taPersonBuildingMapper.selectOne(queryWrapper);
 //                buildingId = personBuilding.getBuildingId();
 //            }
-            return ResponseBean.success(taRecommendCustomerService.getCustomerList(status,pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, customerType, getOrgId(request),getTaPersonBuildingListByUserId(request)));
+            return ResponseBean.success(taRecommendCustomerService.getCustomerList(status,pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, customerType, getOrgId(request),getTaPersonBuildingListByUserId(request),sceneType));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);

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

@@ -33,7 +33,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
 
     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);
+    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);
     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("orgId") Integer orgId);
@@ -48,7 +48,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param sex
      * @return
      */
-    IPage<TaPerson> 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);
+    IPage<TaPerson> 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("sceneType") String sceneType);
 
     /**
      * 导出数据 获取推荐用户数据

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

@@ -35,7 +35,7 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     IPage<TaRecommendCustomer> getUnSignedCustomerList(int pageNumber, int pageSize, String building,String personId);
 
-    IPage getCustomerList(Integer status,int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType, Integer orgId,List<TaPersonBuilding> taPersonBuildingList);
+    IPage getCustomerList(Integer status,int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType, Integer orgId,List<TaPersonBuilding> taPersonBuildingList,String sceneType);
 
     IPage<TaRecommendCustomer> getRecCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, Integer orgId,List<TaPersonBuilding> taPersonBuildingList);
 

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

@@ -480,55 +480,17 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public IPage getCustomerList(Integer status,int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType, Integer orgId,List<TaPersonBuilding> taPersonBuildingList){
+    public IPage getCustomerList(Integer status,int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType, Integer orgId,List<TaPersonBuilding> taPersonBuildingList,String sceneType){
 
         if (CommConstant.CUTOMER_TYPE_PUBLIC.equals(customerType)) {
-
-            /**
-             * <if test="buildingId != null">
-             *             ,(select tpp.name from ta_share_person_from tspf left join ta_person tpp on  tspf.share_person = tpp.person_id where tspf.building_id = #{buildingId} and tspf.is_first_time = 1) as sharePersonName
-             *         </if>
-             */
-
-            /**
-             * SELECT
-             *         b.*
-             *         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
-             */
-
             // 公客
             IPage<TaPerson>page = new Page<>(pageNumber,pageSize);
             // 公客就不用 buildingId 进行查询
-            return taRecommendCustomerMapper.getPublicCustomerList(page,name, tel,  entryType, verifyStatus, sex, orgId,consultTel);
+            return taRecommendCustomerMapper.getPublicCustomerList(page,name, tel,  entryType, verifyStatus, sex, orgId,consultTel,sceneType);
         } else {
             // 私客
             IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
-            return taRecommendCustomerMapper.getCustomerList(page, building, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status,taPersonBuildingList);
+            return taRecommendCustomerMapper.getCustomerList(page, building, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status,taPersonBuildingList,sceneType);
         }
 
     }

src/main/resources/mapper/TaPersonMapper.xml

@@ -559,10 +559,10 @@ FROM
 
     <select id="selectDriftCustomerPageList" resultType="com.huiju.estateagents.entity.TaPerson">
         SELECT
-            DISTINCT(t.person_id) as id,t.* ,d.scene_type,d.scene_alias
+           t.* ,d.scene_type,d.scene_alias
         FROM
             ta_person t
-            LEFT JOIN ta_person_from_record r ON t.person_id = r.person_id
+            LEFT JOIN ta_person_from_record r ON t.person_id = r.person_id AND r.is_first_time = 1 and r.org_id = #{orgId}
             left join td_wx_dict d on r.scene_id = d.scene_id
         WHERE
             t.org_id = #{orgId}

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -171,6 +171,11 @@ FROM
         LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
         LEFT JOIN ta_person c on a.recommend_person = c.person_id
         LEFT JOIN ta_user d on d.user_id = a.realty_consultant
+        LEFT JOIN ta_person_from_record p ON a.person_id = p.person_id AND p.is_first_time = 1
+        <if test="orgId != null">
+            and p.org_id =  #{orgId}
+        </if>
+        LEFT JOIN td_wx_dict w ON p.scene_id = w.scene_id
         <where>
             a.status > 0
             and a.verify_status = 1
@@ -212,6 +217,9 @@ FROM
                     #{personBuilding.buildingId}
                 </foreach>
             </if>
+            <if test="sceneType !=null and sceneType !=''">
+                and p.scene_type = #{sceneType}
+            </if>
         </where>
         order by a.create_date desc
     </select>
@@ -244,6 +252,8 @@ FROM
         ) AS sharePersonName
         FROM
         ta_person b
+        LEFT JOIN ta_person_from_record r ON b.person_id = r.person_id AND r.is_first_time = 1 and r.org_id = #{orgId}
+        left join td_wx_dict d on r.scene_id = d.scene_id
         <where>
             b.status > 0
             and b.org_id = #{orgId}
@@ -252,6 +262,9 @@ FROM
             <if test="name != null and name !=''">
                 and b.nickname like CONCAT('%',#{name}, '%')
             </if>
+            <if test="sceneType !=null and sceneType !=''">
+                and d.scene_type = #{sceneType}
+            </if>
             <if test="tel != null and tel!=''">
                 and b.phone like CONCAT('%',#{tel}, '%')
             </if>