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

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

@@ -46,7 +46,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param sex
      * @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);
+    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);
 
     /**
      * 获取推荐用户数据

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

@@ -339,7 +339,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         if (CommConstant.CUTOMER_TYPE_PUBLIC.equals(customerType)) {
             // 公客
             IPage<TaPerson>page = new Page<>(pageNumber,pageSize);
-            return taRecommendCustomerMapper.getPublicCustomerList(page, name, tel,  entryType, verifyStatus, sex, orgId);
+            return taRecommendCustomerMapper.getPublicCustomerList(page, name, tel,  entryType, verifyStatus, sex, orgId,consultTel);
         } else {
             // 私客
             IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -166,16 +166,16 @@ FROM
                 and a.building_id = #{building}
             </if>
             <if test="name != null and name !=''">
-                and a.name = #{name}
+                and a.name like CONCAT('%',#{name}, '%')
             </if>
             <if test="tel != null and tel!=''">
-                and a.phone = #{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 = #{consultTel}
+                and b.tel like CONCAT('%',#{consultTel}, '%')
             </if>
             <if test="entryType != null and entryType !=''">
                 and a.entry_type = #{entryType}
@@ -208,10 +208,10 @@ FROM
             b.status > 0
             AND IFNULL(b.person_type, '') in ('estate agent', 'customer')
             <if test="name != null and name !=''">
-                and b.nickname = #{name}
+                and b.nickname like CONCAT('%',#{name}, '%')
             </if>
             <if test="tel != null and tel!=''">
-                and b.phone = #{tel}
+                and b.phone like CONCAT('%',#{tel}, '%')
             </if>
             <if test="entryType != null and entryType !=''">
                 and b.entry_type = #{entryType}
@@ -222,6 +222,9 @@ FROM
             <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