1

src/main/java/com/yunzhi/marketing/common/CommConstant.java

@@ -269,10 +269,6 @@ public class CommConstant {
      * */
     public static final String ENTRY_VERIFY = "verify";
 
-    /**
-     * 渠道报备
-     */
-    public static final String ENTRY_CHANNEL_VERIFY = "channel_verify";
     //=================  客户入口类型 end =======================
 
     /**

src/main/java/com/yunzhi/marketing/xlk/service/impl/ChannelCustomerServiceImpl.java

@@ -74,7 +74,7 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
             taRecommendCustomer.setReportDate(LocalDateTime.now());
             taRecommendCustomer.setOrgId(customer.getOrgId());
             taRecommendCustomer.setPersonId(customer.getPersonId());
-            taRecommendCustomer.setEntryType(CommConstant.ENTRY_CHANNEL_VERIFY);
+            taRecommendCustomer.setEntryType(CommConstant.ENTRY_VERIFY);
             taRecommendCustomer.setStatus(CommConstant.CUSTOMER_REPORT);
             taRecommendCustomerMapper.insert(taRecommendCustomer);
             return ResponseBean.success("审核成功");
@@ -126,7 +126,7 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
                 taRecommendCustomer.setReportDate(LocalDateTime.now());
                 taRecommendCustomer.setOrgId(customer.getOrgId());
                 taRecommendCustomer.setPersonId(customer.getPersonId());
-                taRecommendCustomer.setEntryType(CommConstant.ENTRY_CHANNEL_VERIFY);
+                taRecommendCustomer.setEntryType(CommConstant.ENTRY_VERIFY);
                 taRecommendCustomer.setStatus(CommConstant.CUSTOMER_VISITE);
                 taRecommendCustomerMapper.insert(taRecommendCustomer);
                 return ResponseBean.success("审核成功");

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -944,18 +944,19 @@ FROM
     </select>
     <select id="getMarkingCustList" resultType="com.yunzhi.marketing.po.TaRecommendCustomerPO">
         SELECT
-            customer_id AS id,
-            name,
-            phone,
-            picture,
-            sex,
+            t.customer_id AS id,
+            t.NAME,
+            t.phone,
+            t.picture,
+            t.sex,
             "customer" AS type
         FROM
-            ta_recommend_customer
+            ta_recommend_customer t
+        INNER JOIN ta_person p ON t.recommend_person = p.person_id
         WHERE
-            building_id = #{buildingId}
+            t.building_id = #{buildingId}
         <if test="keywords != null and keywords !=''">
-            and name like CONCAT('%',#{keywords}, '%')
+            and t.name like CONCAT('%',#{keywords}, '%')
         </if>
     UNION ALL
         SELECT