修改-经纪人查询商机来源

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerServiceImpl.java

@@ -687,20 +687,19 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
             info.setBloodType(mdDropOption.getDropOptionName());
         }
         String mktCampaign = customer.getMktCampaign();
-        if (!CommonUtil.isNullOrBlank(mktCampaign)){
-            String mktCampaignId = mktCampaign.split(",")[0];
-            MdMkCampaign mdMkCampaign = mdMkCampaignDALService.findByMktCampaignId(Long.valueOf(mktCampaignId));
-            info.setSourceChannel(mdMkCampaign.getName());
-        } else {
-            MktLeadsPool pool = mktLeadsPoolDALService.findByCustomerId(customerId);
-            if(pool!=null){
-                Integer sourceFrom = pool.getSourceFrom();
-                if (!CommonUtil.isNullOrZero(sourceFrom)){
-                    MdDropOptions dropOption = mdDropOptionsDALService.findByDropOptionId(Long.valueOf(sourceFrom));
-                    info.setSourceChannel(dropOption.getDropOptionName());
-                }
+        MktLeadsPool pool = mktLeadsPoolDALService.findByCustomerId(customerId);
+        if (pool != null) {
+            Integer sourceFrom = pool.getSourceFrom();
+            String campaign = pool.getMktCampaign();
+            if (!CommonUtil.isNullOrZero(sourceFrom)) {
+                MdDropOptions dropOption = mdDropOptionsDALService.findByDropOptionId(Long.valueOf(sourceFrom));
+                info.setSourceChannel(dropOption.getDropOptionName());
+            } else if (!CommonUtil.isNullOrBlank(campaign)) {
+                MdMkCampaign mdMkCampaign = mdMkCampaignDALService.findByMktCampaignId(Long.valueOf(campaign));
+                info.setSourceChannel(mdMkCampaign.getName());
             }
         }
+
         info.setAddress(customer.getAddress());
         MktLeadsAssignedTrack mktLeadsAssignedTrack = new MktLeadsAssignedTrack();
         mktLeadsAssignedTrack.setPractitionerId(practitionerId);

yd-api/src/main/resources/mapper/customer/AclPractitionerMapper.xml

@@ -728,7 +728,7 @@
     c.NAME name,
     c.mobile_no mobileNo,
     date_format(a.created_at, '%Y-%m-%d %H:%i:%s') opportunityDate,
-    if (p.mkt_campaign is null ,'',(SELECT cam.name from ag_md_mk_campaign cam where cam.id = p.mkt_campaign )) opportunityFrom,
+    if (p.source_from = 0 ,(SELECT cam.name from ag_md_mk_campaign cam where cam.id = p.mkt_campaign ),(SELECT md.drop_option_name from ag_md_drop_options md where p.source_from = md.id )) opportunityFrom,
     a.id leadsAssignedId ,
     (SELECT md.drop_option_name from ag_md_drop_options md LEFT JOIN ag_mkt_leads_assigned_track amlat ON md.id = amlat.md_drop_option_id where amlat.practitioner_id = a.assigned_practitioner_id and amlat.customer_id = a.customer_id ORDER BY amlat.created_at DESC LIMIT 1) mdDropOptionName,
     (SELECT sum(t.track_score) from ag_mkt_leads_assigned_track t where t.leads_assigned_id = a.id) scoreTotal ,