From 1312ba82d4c880bdb5357d28e0d4af5b285f610f Mon Sep 17 00:00:00 2001 From: 高章伟 <gaozhangwei@prec-tech.com> Date: 星期四, 10 三月 2022 15:54:39 +0800 Subject: [PATCH] 最近一月修改内容 --- force-app/main/default/classes/NFM620Rest.cls | 82 ++++++++++++++++++++++------------------ 1 files changed, 45 insertions(+), 37 deletions(-) diff --git a/force-app/main/default/classes/NFM620Rest.cls b/force-app/main/default/classes/NFM620Rest.cls index 0bf82a8..022d46c 100644 --- a/force-app/main/default/classes/NFM620Rest.cls +++ b/force-app/main/default/classes/NFM620Rest.cls @@ -10,7 +10,7 @@ @RestResource(urlMapping = '/NFM620/*') global with sharing class NFM620Rest { //鏂板NFM620Rest 鍟嗗搧璇㈤棶鍗曟帴鏀舵暟鎹帴鍙� 绮剧悽鎶�鏈� start - + global class GeDatas { public NFMUtil.Monitoring Monitoring; public GeData[] GeData; @@ -25,7 +25,7 @@ public String Product; // 浜у搧淇℃伅 public String Request; // 濮旀墭浜嬮」 public String RequestDetail; // 濮旀墭浜嬮」璇︾粏 - // public String ApproverID; // 瀹℃牳浜哄憳鍛樺伐缂栫爜 + public String ApproverID; // 瀹℃牳浜哄憳鍛樺伐缂栫爜 } @HttpPost @@ -104,7 +104,7 @@ List<String> inquiryNoList = new List<String>(); List<String> conIDList = new List<String>(); List<String> camNoList = new List<String>(); - // List<String> approverIDList = new List<String>(); + List<String> approverIDList = new List<String>(); List<GeData> geDataListNew = new List<GeData>(); for (GeData geData : geDataList) { if (String.isBlank(geData.InquiryNo)) { @@ -122,22 +122,22 @@ } else { conIDList.add(geData.ContactId); } - // if (String.isNotBlank(geData.ApproverID)) { - // approverIDList.add(geData.ApproverID); - // } + if (String.isNotBlank(geData.ApproverID)) { + approverIDList.add(geData.ApproverID); + } if (String.isNotBlank(geData.Campaign)) { camNoList.add(geData.Campaign); } - + geDataListNew.add(geData); } //浣跨敤缁熶竴鐢ㄦ埛ID鑾峰彇绉戝銆佹垬鐣ョ瀹ゅ垎绫汇�佺敤鎴峰鍚嶅苟瀛樺叆Map Map<String, Contact> conInfoMap = new Map<String, Contact>(); if (conIDList.size() > 0) { - List<Contact> conList = [select UnifiedI_Contact_ID__c,Account.Id, - Strategic_dept_Class__c, Strategic_dept_Class__r.OwnerId,Id - from Contact where UnifiedI_Contact_ID__c in: conIDList]; - if (conList.size() > 0){ + List<Contact> conList = [select UnifiedI_Contact_ID__c, Account.Id, + Strategic_dept_Class__c, Strategic_dept_Class__r.OwnerId, Id + from Contact where UnifiedI_Contact_ID__c in: conIDList]; + if (conList.size() > 0) { //绉戝銆佹垬鐣ョ瀹ゅ垎绫汇�佺敤鎴峰鍚嶈幏鍙栨垚鍔� for (Contact conInfo : conList) { conInfoMap.put(conInfo.UnifiedI_Contact_ID__c, conInfo); @@ -160,7 +160,7 @@ //璇㈤棶鍗曠紪鐮佸凡缁忓瓨鍦ㄧ殑鏃跺�欒繛鍚孖D涓�璧峰瓨鍏ap Map<String, String> inqInfoMap = new Map<String, String>(); if (inquiryNoList.size() > 0) { - List<Inquiry_form__c> inquiryList = [select Inquiry_No__c,Id from Inquiry_form__c where Inquiry_No__c in :inquiryNoList]; + List<Inquiry_form__c> inquiryList = [select Inquiry_No__c, Id from Inquiry_form__c where Inquiry_No__c in :inquiryNoList]; if (inquiryList.size() > 0) { for (Inquiry_form__c inqInfo : inquiryList) { inqInfoMap.put(inqInfo.Inquiry_No__c, inqInfo.Id); @@ -168,55 +168,63 @@ } } //浣跨敤瀹℃牳浜哄憳鍛樺伐缂栫爜鏌ヨ鐢ㄦ埛ID - // Map<string,String> ownerMap = new Map<string,String>(); - // List<User> ownerList = [select Id,Employee_No__c from User where Employee_No__c IN:approverIDList]; - // for(User temp : ownerList){ - // ownerMap.put(temp.Employee_No__c,temp.Id); - // } + Map<string,String> ownerMap = new Map<string,String>(); + if(approverIDList.size()>0){ + List<User> ownerList = [select Id,Employee_No__c from User where Employee_No__c IN:approverIDList]; + if (ownerList.size()>0){ + for(User temp : ownerList){ + ownerMap.put(temp.Employee_No__c,temp.Id); + } + } + } + + // 灏哫ML鍚勬暟鎹」鏇存柊鍒板晢鍝佽闂崟瀵硅薄涓� for (GeData geData : geDataListNew) { - + Inquiry_form__c inquiry = new Inquiry_form__c(); - inquiry.Name = geData.Name; //璇㈤棶鍗曞悕绉� + inquiry.ComPlat_Name__c = geData.Name; //璇㈤棶鍗曞悕绉� inquiry.Inquiry_No__c = geData.InquiryNo; //璇㈤棶鍗曠紪鐮� inquiry.Opportunity_Division__c = '璇环'; //鎰忓悜鍖哄垎 - inquiry.Status__c = '鏈窡杩�'; //璇㈤棶鍗曠姸鎬� + inquiry.Status__c = '01.鏈窡杩�'; //璇㈤棶鍗曠姸鎬� inquiry.Request_Detail__c = geData.RequestDetail; //濮旀墭浜嬮」璇︾粏 inquiry.Product1__c = geData.Product; //浜у搧淇℃伅 inquiry.ContactId__c = geData.ContactId; //缁熶竴鐢ㄦ埛ID - // inquiry.OwnerId = ownerMap.get(geData.ApproverID); //鎵�鏈変汉 - + if (String.isNotBlank(ownerMap.get(geData.ApproverID))){ + inquiry.OwnerId = ownerMap.get(geData.ApproverID); //鎵�鏈変汉 + } + //濮旀墭浜嬮」鍙栧�煎悗鎷嗗垎 List<String> requestList = geData.Request.split(';'); String request1 = ''; for (String req11 : requestList) { - request1 += NFMUtil.getMapValue(transferMap,'Request1__c', req11, iflog) +';'; - } - inquiry.Request1__c = request1.substring(0, request1.length()-1); //濮旀墭浜嬮」 - + request1 += NFMUtil.getMapValue(transferMap, 'Request1__c', req11, iflog) + ';'; + } + inquiry.Request1__c = request1.substring(0, request1.length() - 1); //濮旀墭浜嬮」 + //浣跨敤缁熶竴鐢ㄦ埛ID鑾峰彇绉戝銆佹垬鐣ョ瀹ゃ�佸鎴峰鍚� if (conInfoMap.containsKey(geData.ContactId)) { Contact contact = conInfoMap.get(geData.ContactId); - inquiry.Hospital_Name__c = contact.Account.Id; //绉戝鍚� - inquiry.Department_Class__c = contact.Strategic_dept_Class__c; //鎴樼暐绉戝鍒嗙被 + inquiry.Hospital_Name__c = contact.Account.Id; //绉戝鍚� + //inquiry.Department_Class__c = contact.Strategic_dept_Class__c; //鎴樼暐绉戝鍒嗙被 inquiry.Contact_Name__c = contact.Id; //瀹㈡埛濮撳悕 - inquiry.OwnerId = contact.Strategic_dept_Class__r.OwnerId; //鎵�鏈変汉 - } + //inquiry.OwnerId = contact.Strategic_dept_Class__r.OwnerId; //鎵�鏈変汉 + } //浣跨敤甯傚満娲诲姩缂栫爜鑾峰彇甯傚満娲诲姩ID - if (String.isNotBlank(geData.Campaign)){ - if (String.isNotBlank(camInfoMap.get(geData.Campaign))){ + if (String.isNotBlank(geData.Campaign)) { + if (String.isNotBlank(camInfoMap.get(geData.Campaign))) { inquiry.Campaign__c = camInfoMap.get(geData.Campaign); //涓昏瀛︿細 - inquiry.LeadSource__c = '瀛︿細/娌欓緳'; //璇㈤棶鍗曟潵婧� - }else { - iflog.ErrorLog__c += geData.InquiryNo +'锛氬競鍦烘椿鍔ㄧ紪鐮佷笉瀛樺湪銆俓n'; - continue; + inquiry.LeadSource__c = '瀛︿細浼氳'; //璇㈤棶鍗曟潵婧� + } else { + iflog.ErrorLog__c += geData.InquiryNo + '锛氬競鍦烘椿鍔ㄧ紪鐮佷笉瀛樺湪銆俓n'; + continue; } } else { inquiry.LeadSource__c = '鏅烘収鍖荤枟'; //璇㈤棶鍗曟潵婧� } - logstr += '鍜ㄨ鍗曟潵婧�:' + inquiry.LeadSource__c +'\n'; + logstr += '鍜ㄨ鍗曟潵婧�:' + inquiry.LeadSource__c + '\n'; //鑱旂郴鏂瑰紡鐨勫�兼槸鍚﹀寘鍚獲鏉ュ垽鏂槸閭杩樻槸鐢佃瘽 if (geData.ContactWay.contains('@')) { inquiry.Phone__c = ''; //鐢佃瘽 -- Gitblit v1.9.1