From 0913862c088ba845fee09a2fb713b2affc2c0b5a Mon Sep 17 00:00:00 2001
From: DESKTOP-0K9VGFE\hp <pengkun@prec-tech.com>
Date: 星期五, 11 三月 2022 19:44:09 +0800
Subject: [PATCH] Merge branch 'OBPM_705_706'
---
force-app/main/default/classes/NFM705Rest.cls | 27 ++++----
force-app/main/default/classes/NFM706RestTest.cls | 51 +++++++++++++++++
force-app/main/default/classes/StateCityUtilTest.cls-meta.xml | 5 +
force-app/main/default/classes/NFM705RestTest.cls | 75 ++++++++++++++++++++++++-
4 files changed, 141 insertions(+), 17 deletions(-)
diff --git a/force-app/main/default/classes/NFM705Rest.cls b/force-app/main/default/classes/NFM705Rest.cls
index ea52474..2396957 100644
--- a/force-app/main/default/classes/NFM705Rest.cls
+++ b/force-app/main/default/classes/NFM705Rest.cls
@@ -131,18 +131,12 @@
// continue;
// }
meetingApprovedNoList.add(ged.MeetingApprovedNo);
- if (String.isNotBlank(ged.Num)) {
- NumList.add(ged.Num);
- }
+ // if (String.isNotBlank(ged.Num)) {
+ // NumList.add(ged.Num);
+ // }
}
//Map<String,String> campaignMap = new Map<String,String>();
- List<Campaign> campaignList = NumList.size() > 0 ? [select Id,
- Num__c,
- MeetingApprovedNo__c
- from Campaign
- where Num__c IN: NumList
- ] : new List<Campaign>();
// for(Campaign temp : campaignList){
// campaignMap.put(temp.Num__c,temp.Id);
// }
@@ -176,8 +170,8 @@
aca.StateMaster__c = ged.StateMaster;
aca.CityMaster__c = ged.CityMaster;
aca.WorkshopPlace__c = ged.WorkshopPlace;
- aca.HostName__c = ged.HostName;
- aca.CooperatorCompany__c = ged.CooperatorCompany;
+ aca.HostName__c = String.isBlank(ged.HostName) ? '鏃�' : ged.HostName;
+ aca.CooperatorCompany__c = String.isBlank(ged.CooperatorCompany) ? '鏃�' : ged.CooperatorCompany;
aca.ConveningParticipantsNum__c = ged.ConveningParticipantsNum;
aca.IsPaidToSponsor__c = NFMUtil.getMapValue(transferMap, 'IsPaidToSponsor__c', string.valueof(ged.IsPaidToSponsor), iflog);
aca.SponsorshipCategory__c = ged.SponsorshipCategory;
@@ -194,7 +188,8 @@
aca.Id = oldacfcMap.get(ged.MeetingApprovedNo).Id;
aca.Num__c = String.isBlank(aca.Num__c) ? oldacfcMap.get(ged.MeetingApprovedNo).Num__c : aca.Num__c;
}
-
+ NumList.add(aca.Num__c);
+ system.debug('NumList------------->'+NumList);
// 纭鐢宠浜�
System.debug('aca.Id: ' + aca.Id);
if (String.isBlank(aca.Id)) {
@@ -211,7 +206,12 @@
acaList.add(aca);
}
-
+ List<Campaign> campaignList = NumList.size() > 0 ? [select Id,
+ Num__c,
+ MeetingApprovedNo__c
+ from Campaign
+ where Num__c IN: NumList
+ ] : new List<Campaign>();
// 鏌ユ壘鎵�鏈変汉
if (user_nos != null && user_nos.size() > 0) {
users = [select Id, Employee_No__c from User where Employee_No__c in :user_nos];
@@ -234,7 +234,6 @@
if (acaList.size() > 0) {
// 鍐欏叆鍐宠淇℃伅
upsert acaList;
-
// 鍏变韩鏉冮檺
SetSharing(users, acaList);
// 鑷姩鍒涘缓瀛︿細
diff --git a/force-app/main/default/classes/NFM705RestTest.cls b/force-app/main/default/classes/NFM705RestTest.cls
index b87608c..cc752e2 100644
--- a/force-app/main/default/classes/NFM705RestTest.cls
+++ b/force-app/main/default/classes/NFM705RestTest.cls
@@ -1,6 +1,19 @@
@isTest
public class NFM705RestTest {
+
static testMethod void testMothodOne(){
+ BatchIF_Transfer__c temp1 = new BatchIF_Transfer__c();
+ BatchIF_Transfer__c temp2 = new BatchIF_Transfer__c();
+ temp1.Table__c = 'Application_for_Conference_Adjudication__c';
+ temp1.Column__c = 'ProcessState__c';
+ temp1.External_Value__c = '110';
+ temp1.Internal_Value__c = '鑽夌';
+ insert temp1;
+ temp2.Table__c = 'Application_for_Conference_Adjudication__c';
+ temp2.Column__c = 'ProcessState__c';
+ temp2.External_Value__c = '120';
+ temp2.Internal_Value__c = '瀹℃壒涓�';
+ insert temp2;
BatchIF_Log__c testLog = new BatchIF_Log__c();
testLog.CurrencyIsoCode = 'CNY';
testLog.Type__c = 'NFM705';
@@ -9,20 +22,77 @@
testLog.ErrorLog__c = '';
testLog.MessageGroupNumber__c = '20211207';
testLog.RowDataFlg__c = true;
- testLog.Log__c = '[{"WorkshopPlace":"鏈濋槼","StateMaster":"鍖椾含甯�","StartDate":"2022-03-25T00:00:00","SponsorshipCategory":"","SharedEditing":"om002080,om003696,om001646","ProcessState":110,"OfficeCategory":"GI锛圡EBG锛�,ET锛圡EBG锛�,","Num":"","Name":"鑷富涓诲姙娲诲姩-SFDC娴嬭瘯0310","MeetingType":"绾夸笂+绾夸笅","MeetingApprovedNo":"ME154P03-0004","IsPaidToSponsor":"N","IsCoOrganizingActivities":"Y","HostName":"","ExpectedOlympusAttendance":10,"ExpectedHcpAttendance":2,"EndDate":"2022-03-30T00:00:00","CooperatorCompany":"","ConveningParticipantsNum":12,"CityMaster":"鍖椾含甯�","BudgetType":"鍏朵粬","Applicant":"om002021","ActivityTypeName":"鑷富涓诲姙娲诲姩"}]';
+ testLog.Log__c = '[{"WorkshopPlace":"娌冲寳","StateMaster":"娌冲寳鐪�","StartDate":"2022-03-25T00:00:00","SponsorshipCategory":"","SharedEditing":"","ProcessState":110,"OfficeCategory":"","Num":"MT-GI-202203-5850","Name":"TEST璇存槑浼� (2022/01/13 - 2022/03/24) v1","MeetingType":"绾夸笂+绾夸笅","MeetingApprovedNo":"ME154P03-0007","IsPaidToSponsor":"鍚�","IsCoOrganizingActivities":"Y","HostName":"1","ExpectedOlympusAttendance":10,"ExpectedHcpAttendance":111,"EndDate":"2022-03-30T00:00:00","CooperatorCompany":"2","ConveningParticipantsNum":121,"CityMaster":"鐭冲搴勫競","BudgetType":"鍏朵粬","Applicant":"om001646","ActivityTypeName":"鑷富涓诲姙娲诲姩"}]';
//[Select Id, Name, Log__c, ErrorLog__c, Log2__c, Log3__c, Log4__c, Log5__c, Log6__c, Log7__c, Log8__c, Log9__c, Log10__c, Log11__c, Log12__c, MessageGroupNumber__c, retry_cnt__c,NFM624_Secondary_processing__c from BatchIF_Log__c where RowDataFlg__c = true and Id =: rowData_Id]
insert testLog;
NFM705Rest.main(testLog.Id);
+ testLog.Log__c = '[{"WorkshopPlace":"娌冲寳","StateMaster":"娌冲寳鐪�","StartDate":"2022-03-25T00:00:00","SponsorshipCategory":"","SharedEditing":"","ProcessState":120,"OfficeCategory":"","Num":"MT-GI-202203-5850","Name":"TEST璇存槑浼� (2022/01/13 - 2022/03/24) v1","MeetingType":"绾夸笂+绾夸笅","MeetingApprovedNo":"ME154P03-0007","IsPaidToSponsor":"鍚�","IsCoOrganizingActivities":"Y","HostName":"1","ExpectedOlympusAttendance":10,"ExpectedHcpAttendance":111,"EndDate":"2022-03-30T00:00:00","CooperatorCompany":"2","ConveningParticipantsNum":121,"CityMaster":"鐭冲搴勫競","BudgetType":"鍏朵粬","Applicant":"om001646","ActivityTypeName":"鑷富涓诲姙娲诲姩"}]';
+ update testLog;
+ NFM705Rest.main(testLog.Id);
+ //controller.ReservedProductVerification();
+ // string[] azzz = new String[]{'1','2'};
+ // system.debug(azzz[3]);
}
static testMethod void testMethodTwo() {
+ BatchIF_Transfer__c temp1 = new BatchIF_Transfer__c();
+ BatchIF_Transfer__c temp2 = new BatchIF_Transfer__c();
+ temp1.Table__c = 'Application_for_Conference_Adjudication__c';
+ temp1.Column__c = 'ProcessState__c';
+ temp1.External_Value__c = '110';
+ temp1.Internal_Value__c = '鑽夌';
+ insert temp1;
+ temp2.Table__c = 'Application_for_Conference_Adjudication__c';
+ temp2.Column__c = 'ProcessState__c';
+ temp2.External_Value__c = '120';
+ temp2.Internal_Value__c = '瀹℃壒涓�';
+ insert temp2;
+ List<RecordType> rectCo = [select Id, Name, DeveloperName from RecordType where IsActive = true and SobjectType = 'Campaign' and DeveloperName = 'Society'];
+ System.runAs(new User(Id = Userinfo.getUserId())) {
+ User user = new User(Test_staff__c = true);
+ user.LastName = '_銈点兂銉栥儶銉冦偢';
+ user.FirstName = '銇�';
+ user.Alias = '銇�';
+ user.Email = 'olympusTest03@sunbridge.com';
+ user.Username = 'olympusTest03@sunbridge.com';
+ user.IsActive = true;
+ user.EmailEncodingKey = 'ISO-2022-JP';
+ user.TimeZoneSidKey = 'Asia/Tokyo';
+ user.LocaleSidKey = 'ja_JP';
+ user.LanguageLocaleKey = 'ja';
+ user.ProfileId = System.Label.ProfileId_SystemAdmin;
+ user.Province__c = '鍖椾含';
+ user.Dept__c = '鍖荤枟鍗庡寳钀ヤ笟鏈儴';
+ user.Use_Start_Date__c = Date.today().addMonths(-6);
+ insert user;
+
+ Campaign cam = new Campaign();
+ cam.Name = 'test campaign';
+ cam.StartDate = Date.today().addDays(15);
+ cam.EndDate = Date.today().addDays(18);
+ cam.Name2__c = '1234';
+ cam.Status = '鐢宠涓�';
+ cam.Mailflg_after45__c = true;
+ cam.Mailflg_cancel__c = true;
+ cam.Mailflg_before15__c = true;
+ cam.Mailflg_before7__c = true;
+ cam.Mailflg_after3__c = true;
+ cam.HostName__c = '1';
+ cam.cooperatorCompany__c = '1';
+ cam.RecordTypeId = rectCo[0].Id;
+ cam.OwnerId = user.Id;
+ cam.Num__c = 'MT-XN-202203-5854';
+ insert cam;
+ system.debug('cam.Num__c'+cam.Num__c);
+ }
+
Test.startTest();
RestRequest req = new RestRequest();
RestResponse res = new RestResponse();
- String JsonMsg = '{"Monitoring":{"TransmissionDateTime":"202107131529","Text":null,"Tag":null,"Sender":"OBPM","Receiver":"SFDC","NumberOfRecord":"2","MessageType":"NFM705","MessageGroupNumber":null},"GeData":[{"WorkshopPlace":"鏈潵鍩�","StateMaster":"璐靛窞","StartDate":"20211215","SponsorshipCategory":"Y","ProcessState":110,"OfficeCategory":"1.娑堝寲绉�","Num":"MT-HB-202112-5773","Name":"Test浼氳","MeetingType":"涓诲姙浼�","MeetingApprovedNo":"TEST99793","IsPaidToSponsor":"鐧界粰","HostName":"榛旇タ鍗楀窞涓尰闄�","EndDate":"20211216","CooperatorCompany":"鏈潵鍩�","ConveningParticipantsNum":50,"CityMaster":"瀹夐『","BudgetType":"鏂颁骇鍝佷笂甯�","ActivityTypeName":"鍡紵涔栦箹绔欏ソ锛�","ExpectedOlympusAttendance":50,"ExpectedHcpAttendance":100}]}';
+ String JsonMsg = '{"Monitoring":{"TransmissionDateTime":"202107131529","Text":null,"Tag":null,"Sender":"OBPM","Receiver":"SFDC","NumberOfRecord":"2","MessageType":"NFM705","MessageGroupNumber":null},"GeData":[{"WorkshopPlace":"浜戝崡","StateMaster":"浜戝崡鐪�","StartDate":"2022-03-28T00:00:00","SponsorshipCategory":"","SharedEditing":"on000695,on000630,om002080","ProcessState":120,"OfficeCategory":"GI锛圡EBG锛�,ET锛圡EBG锛�,","Num":"MT-XN-202203-5854","Name":"娴嬭瘯浼氳-001 (2022/03/28 - 2022/03/31)鍏宠仈OBPM ","MeetingType":"绾夸笅","MeetingApprovedNo":"ME154P03-0009","IsPaidToSponsor":"鍚�","IsCoOrganizingActivities":"N","HostName":"濂ユ灄宸存柉","ExpectedOlympusAttendance":2,"ExpectedHcpAttendance":100,"EndDate":"2022-04-09T00:00:00","CooperatorCompany":"鏃�","ConveningParticipantsNum":102,"CityMaster":"鏄嗘槑甯�","BudgetType":"浜у搧鎺ㄥ箍","Applicant":"om001646","ActivityTypeName":"鑷富涓诲姙娲诲姩"}]}';
req.requestURI = 'services/apexrest/NFM705/execute';
req.httpMethod = 'POST';
req.requestBody = Blob.valueof(JsonMsg);
@@ -32,6 +102,5 @@
NFM705Rest.doPost();
Test.stopTest();
-
}
}
\ No newline at end of file
diff --git a/force-app/main/default/classes/NFM706RestTest.cls b/force-app/main/default/classes/NFM706RestTest.cls
index 97ae4dc..0c74389 100644
--- a/force-app/main/default/classes/NFM706RestTest.cls
+++ b/force-app/main/default/classes/NFM706RestTest.cls
@@ -23,6 +23,55 @@
}
@isTest static void test_method_two(){
+ List<RecordType> rectCo = [select Id, Name, DeveloperName from RecordType where IsActive = true and SobjectType = 'Campaign' and DeveloperName = 'Society'];
+ System.runAs(new User(Id = Userinfo.getUserId())) {
+ User user = new User(Test_staff__c = true);
+ user.LastName = '_銈点兂銉栥儶銉冦偢';
+ user.FirstName = '銇�';
+ user.Alias = '銇�';
+ user.Email = 'olympusTest03@sunbridge.com';
+ user.Username = 'olympusTest03@sunbridge.com';
+ user.IsActive = true;
+ user.EmailEncodingKey = 'ISO-2022-JP';
+ user.TimeZoneSidKey = 'Asia/Tokyo';
+ user.LocaleSidKey = 'ja_JP';
+ user.LanguageLocaleKey = 'ja';
+ user.ProfileId = System.Label.ProfileId_SystemAdmin;
+ user.Province__c = '鍖椾含';
+ user.Dept__c = '鍖荤枟鍗庡寳钀ヤ笟鏈儴';
+ user.Use_Start_Date__c = Date.today().addMonths(-6);
+ insert user;
+
+ Application_for_Conference_Adjudication__c afca = new Application_for_Conference_Adjudication__c();
+ afca.Name = 'hahaha';
+ afca.MeetingApprovedNo__c = 'TEST99793';
+ afca.Num__c = 'MT-HB-202112-5773';
+ afca.ProcessState__c = '瀹℃壒涓�';
+ insert afca;
+
+ Campaign cam = new Campaign();
+ cam.Name = 'test campaign';
+ cam.StartDate = Date.today().addDays(15);
+ cam.EndDate = Date.today().addDays(18);
+ cam.Name2__c = '1234';
+ cam.Status = '鐢宠涓�';
+ cam.Mailflg_after45__c = true;
+ cam.Mailflg_cancel__c = true;
+ cam.Mailflg_before15__c = true;
+ cam.Mailflg_before7__c = true;
+ cam.Mailflg_after3__c = true;
+ cam.HostName__c = '1';
+ cam.cooperatorCompany__c = '1';
+ cam.RecordTypeId = rectCo[0].Id;
+ cam.OwnerId = user.Id;
+ cam.Meeting_Approved_No__c = afca.id;
+ insert cam;
+ system.debug('cam.Num__c'+cam.Num__c);
+
+
+
+ }
+
RestRequest req = new RestRequest();
RestResponse res = new RestResponse();
@@ -36,5 +85,7 @@
RestContext.response = res;
NFM706Rest.doPost();
+
+
}
}
\ No newline at end of file
diff --git a/force-app/main/default/classes/StateCityUtilTest.cls-meta.xml b/force-app/main/default/classes/StateCityUtilTest.cls-meta.xml
new file mode 100644
index 0000000..dd61d1f
--- /dev/null
+++ b/force-app/main/default/classes/StateCityUtilTest.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>52.0</apiVersion>
+ <status>Active</status>
+</ApexClass>
--
Gitblit v1.9.1