傅行帆 3 years ago
parent
commit
3e91224957

+ 0
- 4
src/main/java/com/yunzhi/marketing/common/CommConstant.java View File

269
      * */
269
      * */
270
     public static final String ENTRY_VERIFY = "verify";
270
     public static final String ENTRY_VERIFY = "verify";
271
 
271
 
272
-    /**
273
-     * 渠道报备
274
-     */
275
-    public static final String ENTRY_CHANNEL_VERIFY = "channel_verify";
276
     //=================  客户入口类型 end =======================
272
     //=================  客户入口类型 end =======================
277
 
273
 
278
     /**
274
     /**

+ 2
- 2
src/main/java/com/yunzhi/marketing/xlk/service/impl/ChannelCustomerServiceImpl.java View File

74
             taRecommendCustomer.setReportDate(LocalDateTime.now());
74
             taRecommendCustomer.setReportDate(LocalDateTime.now());
75
             taRecommendCustomer.setOrgId(customer.getOrgId());
75
             taRecommendCustomer.setOrgId(customer.getOrgId());
76
             taRecommendCustomer.setPersonId(customer.getPersonId());
76
             taRecommendCustomer.setPersonId(customer.getPersonId());
77
-            taRecommendCustomer.setEntryType(CommConstant.ENTRY_CHANNEL_VERIFY);
77
+            taRecommendCustomer.setEntryType(CommConstant.ENTRY_VERIFY);
78
             taRecommendCustomer.setStatus(CommConstant.CUSTOMER_REPORT);
78
             taRecommendCustomer.setStatus(CommConstant.CUSTOMER_REPORT);
79
             taRecommendCustomerMapper.insert(taRecommendCustomer);
79
             taRecommendCustomerMapper.insert(taRecommendCustomer);
80
             return ResponseBean.success("审核成功");
80
             return ResponseBean.success("审核成功");
126
                 taRecommendCustomer.setReportDate(LocalDateTime.now());
126
                 taRecommendCustomer.setReportDate(LocalDateTime.now());
127
                 taRecommendCustomer.setOrgId(customer.getOrgId());
127
                 taRecommendCustomer.setOrgId(customer.getOrgId());
128
                 taRecommendCustomer.setPersonId(customer.getPersonId());
128
                 taRecommendCustomer.setPersonId(customer.getPersonId());
129
-                taRecommendCustomer.setEntryType(CommConstant.ENTRY_CHANNEL_VERIFY);
129
+                taRecommendCustomer.setEntryType(CommConstant.ENTRY_VERIFY);
130
                 taRecommendCustomer.setStatus(CommConstant.CUSTOMER_VISITE);
130
                 taRecommendCustomer.setStatus(CommConstant.CUSTOMER_VISITE);
131
                 taRecommendCustomerMapper.insert(taRecommendCustomer);
131
                 taRecommendCustomerMapper.insert(taRecommendCustomer);
132
                 return ResponseBean.success("审核成功");
132
                 return ResponseBean.success("审核成功");

+ 9
- 8
src/main/resources/mapper/TaRecommendCustomerMapper.xml View File

944
     </select>
944
     </select>
945
     <select id="getMarkingCustList" resultType="com.yunzhi.marketing.po.TaRecommendCustomerPO">
945
     <select id="getMarkingCustList" resultType="com.yunzhi.marketing.po.TaRecommendCustomerPO">
946
         SELECT
946
         SELECT
947
-            customer_id AS id,
948
-            name,
949
-            phone,
950
-            picture,
951
-            sex,
947
+            t.customer_id AS id,
948
+            t.NAME,
949
+            t.phone,
950
+            t.picture,
951
+            t.sex,
952
             "customer" AS type
952
             "customer" AS type
953
         FROM
953
         FROM
954
-            ta_recommend_customer
954
+            ta_recommend_customer t
955
+        INNER JOIN ta_person p ON t.recommend_person = p.person_id
955
         WHERE
956
         WHERE
956
-            building_id = #{buildingId}
957
+            t.building_id = #{buildingId}
957
         <if test="keywords != null and keywords !=''">
958
         <if test="keywords != null and keywords !=''">
958
-            and name like CONCAT('%',#{keywords}, '%')
959
+            and t.name like CONCAT('%',#{keywords}, '%')
959
         </if>
960
         </if>
960
     UNION ALL
961
     UNION ALL
961
         SELECT
962
         SELECT