Merge branch 'v3' into v3.5

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

@@ -356,21 +356,6 @@ public class MiniAppController extends BaseController {
 //            if(list.size()<=0){
 //                taCustomerPersonService.insertBean(person.getPersonId(),customers.getCustomerId());
 //            }
-        } else{
-            TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
-            taRecommendCustomer.setPersonId(person.getPersonId());
-            taRecommendCustomer.setPicture(person.getAvatarurl());
-            taRecommendCustomer.setCountry(person.getCountry());
-            taRecommendCustomer.setCity(person.getCity());
-            taRecommendCustomer.setProvince(person.getProvince());
-            taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
-            taRecommendCustomer.setOrgId(getOrgId(request));
-            taRecommendCustomer.setEntryType(CommConstant.ENTRY_VOLUNTEER);
-            taRecommendCustomer.setSex(Integer.getInteger(person.getGender()));
-            taRecommendCustomer.setName(person.getNickname());
-            taRecommendCustomer.setPhone(person.getPhone());
-            taRecommendCustomer.setCreateDate(LocalDateTime.now());
-            taRecommendCustomerService.save(taRecommendCustomer);
         }
 //        else{
 //            TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();

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

@@ -44,7 +44,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param sex
      * @return
      */
-    IPage<TaRecommendCustomer> getPublicCustomerList(IPage<TaRecommendCustomer> page, @Param("buildingId") String buildingId, @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("buildingId") String buildingId, @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

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

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -203,11 +203,35 @@ FROM
 	WHERE a.customer_id = #{customerId}
     </select>
 
-    <select id="getPublicCustomerList" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
-        select * from
-        ta_recommend_customer ta
-        WHERE (ta.realty_consultant is NULL OR ta.realty_consultant = '')
-        order by ta.create_date desc
+    <select id="getPublicCustomerList" resultType="com.huiju.estateagents.entity.TaPerson">
+        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
     </select>
 
     <select id="getRecCustomerExport" resultType="com.huiju.estateagents.excel.ExcelRecommendCustomer">