合并

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

@@ -123,6 +123,12 @@ public class TaRecommendCustomer implements Serializable {
     @TableField(exist = false)
     private Map<String, Object> consultants;
 
+    @TableField(exist = false)
+    private String consultantName;
+
+    @TableField(exist = false)
+    private String consultTel;
+
     private String verifyStatus;
 
     private String verifyRemark;

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

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaRecommendCustomer;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -22,5 +23,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
 
     TaRecommendCustomer getCustomerDetail(@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);
+
 
 }

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

@@ -247,22 +247,8 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
     @Override
     public IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel){
-        QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(org.apache.commons.lang3.StringUtils.isNotBlank(building),"building_id",building);
-        queryWrapper.like(org.apache.commons.lang3.StringUtils.isNotBlank(name), "name",name);
-        queryWrapper.eq(org.apache.commons.lang3.StringUtils.isNotBlank(tel),"phone",tel);
-        if(org.apache.commons.lang3.StringUtils.isNotBlank(consultName)){
-            List<String> consultIds = taPersonMapper.getConsultantByName(consultName);
-            queryWrapper.in("realty_consultant",consultIds);
-        }
-        if(org.apache.commons.lang3.StringUtils.isNotBlank(consultTel)){
-            String consultId = taPersonMapper.getConsultantByTel(consultTel);
-            queryWrapper.eq("realty_consultant",consultId);
-        }
-
-        queryWrapper.gt("status", CommConstant.MESSAGE_UNREAD);
         IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
-        return taRecommendCustomerMapper.selectPage(page,queryWrapper);
+        return taRecommendCustomerMapper.getCustomerList(page,building,name,tel,consultName,consultTel);
     }
 
     @Override

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -30,4 +30,32 @@ FROM
 	LEFT JOIN ta_person_visit_record c ON b.person_id = c.person_id
 	where a.customer_id = #{customerId}
     </select>
+
+    <select id="getCustomerList" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
+        SELECT
+	a.*,
+	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
+        <if test="building != null and building !=''">
+            and a.building_id = #{building}
+        </if>
+        <if test="name != null and name !=''">
+            and a.name = #{name}
+        </if>
+        <if test="tel != null and tel!=''">
+            and a.phone = #{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}
+        </if>
+    </where>
+    </select>
 </mapper>