From 47807a3ee0b770e941b3ec7335de439200cc417e Mon Sep 17 00:00:00 2001
From: 彭锟 <pengkun@prec-tech.com>
Date: 星期三, 30 三月 2022 19:50:50 +0800
Subject: [PATCH] 330 624相关修改
---
force-app/main/default/classes/UpdateContractAimAmountHandler.cls | 19 +---
force-app/main/default/classes/NFM624RestTest.cls | 193 ++++++++++++++++++++++++++++++++++++++---------
2 files changed, 161 insertions(+), 51 deletions(-)
diff --git a/force-app/main/default/classes/NFM624RestTest.cls b/force-app/main/default/classes/NFM624RestTest.cls
index 130f94c..9341dfe 100644
--- a/force-app/main/default/classes/NFM624RestTest.cls
+++ b/force-app/main/default/classes/NFM624RestTest.cls
@@ -29,9 +29,9 @@
hp.FSE_GI_Main_Leader__c = hpOwner.Id;
hp.Advance_Payment_Identification_Approval__c = Date.today().addyears(-1);
insert hp;
-
+ Account hptemp = [select Id,PlatformCode__c,AgentCode_Ext__c from Account where Id = :hp.Id];
//鎴樼暐绉戝
- Account dc = [select Id, Name, RecordType_DeveloperName__c, Account2__c from Account where ParentId = :hp.Id and RecordType_DeveloperName__c = 'Department_Class_GI'];
+ Account dc = [select Id, Name, RecordType_DeveloperName__c, Account2__c from Account where ParentId = :hp.Id and RecordType_DeveloperName__c = 'Department_Class_BF'];
//绉戝
// Account dpt = new Account(RecordTypeId = '01210000000QfmR');
@@ -55,12 +55,24 @@
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":[{"Type":"鍖荤敓","State":"鍖椾含甯�","ServiceUserId":"","RelatedHospital":"354044","RelatedDepartment":"760129","RegSource":"2","PersonManagementCode":"C000132345","Name":"鍒樼拹","Mobile":"13683268803","HospitalManagementCode2":"415","ForbiddenStatus":true,"DepartmentName":"鍖椾含澶у绗笁鍖婚櫌 鍛煎惛绉� 鍛煎惛绉�","DepartmentManagementCode2":"416","DepartmentClass":"鍛煎惛绉�","ContactId":"2552","ContactAddress":"","City":"娴锋穩鍖�","ApproverID":"","AgentFlag":false,"AccountName":"鍖椾含澶у绗笁鍖婚櫌"}]}';
+ String JsonMsg = '{"Monitoring":{"TransmissionDateTime":"202107131529","Text":null,"Tag":null,"Sender":"OBPM","Receiver":"SFDC","NumberOfRecord":"2","MessageType":"NFM624","MessageGroupNumber":null},"GeData":[{"TypeEncrypted":"53173e61ac22874aab5b8d1f802515db","Type":"*****","State":"鍖椾含甯�","ServiceUserId":"958717798199066624","RelatedHospital":"8020739","RelatedDepartment":"","RegSource":"1","PersonManagementCode":"","NameEncrypted":"d5cd51938e71eebbc0641f4e976146e7","Name":"***","MobileEncrypted":"c34725fe79b3965ea9abfd7c1435cf9a","Mobile":"***********","HospitalManagementCode2":"1377","ForbiddenStatus":false,"DepartmentName":"鏅绉�","DepartmentManagementCode2":"1378","DepartmentClass":"鏅绉�","DataId":"958717797737693184","ContactId":"958717798199066624","ContactAddressEncrypted":"","ContactAddress":"","City":"鏄屽钩鍖�","ApproverID":"om003669","AgentFlag":false,"AccountName":"鍖椾含浜兘鍎跨鍖婚櫌"}]}';
req.requestURI = 'services/apexrest/NFM624/execute';
req.httpMethod = 'POST';
req.requestBody = Blob.valueof(JsonMsg);
RestContext.request = req;
RestContext.response= res;
+
+ NFM624Rest.execute();
+
+ RestRequest req2 = new RestRequest();
+ RestResponse res2 = new RestResponse();
+
+ String JsonMsg2 = '{"Monitoring":{"TransmissionDateTime":"202107131529","Text":null,"Tag":null,"Sender":"OBPM","Receiver":"SFDC","NumberOfRecord":"2","MessageType":"NFM624","MessageGroupNumber":null},"GeData":[{"Type":"鍖荤敓","State":"鍖椾含甯�","ServiceUserId":"","RelatedHospital":"'+hptemp.PlatformCode__c+'","RelatedDepartment":" ","RegSource":"2","PersonManagementCode":"C000132345","Name":"鍒樼拹","Mobile":"13683268803","HospitalManagementCode2":"415","ForbiddenStatus":true,"DepartmentName":"鍖椾含澶у绗笁鍖婚櫌 鍛煎惛绉� 鍛煎惛绉�","DepartmentManagementCode2":"416","DepartmentClass":"鍛煎惛绉�","ContactId":"2552","ContactAddress":"","City":"娴锋穩鍖�","ApproverID":"","AgentFlag":false,"AccountName":"鍖椾含澶у绗笁鍖婚櫌"}]}';
+ req2.requestURI = 'services/apexrest/NFM624/execute';
+ req2.httpMethod = 'POST';
+ req2.requestBody = Blob.valueof(JsonMsg2);
+ RestContext.request = req2;
+ RestContext.response= res2;
NFM624Rest.execute();
@@ -75,48 +87,153 @@
testLog.ErrorLog__c = '';
testLog.MessageGroupNumber__c = '20211207';
testLog.RowDataFlg__c = true;
- testLog.Log__c = '[{"Type":"鍖荤敓","State":"鍖椾含甯�","ServiceUserId":"","RelatedHospital":"8087702","RelatedDepartment":"8087715","RegSource":"1","PersonManagementCode":"C000132192","Name":"鑳栬揪","Mobile":"17734281527","HospitalManagementCode2":"1118000","ForbiddenStatus":false,"DepartmentName":"娑堝寲绁炵粡娣峰悎绉�","DepartmentManagementCode2":"1118004","DepartmentClass":"娑堝寲绉�","ContactId":"1118002","ContactAddress":"鍖椾含甯傛湞闃冲尯浜┈妗�","City":"鏈濋槼鍖�","AgentFlag":false,"AccountName":"鎭╂儬鍖婚櫌"}]';
+ testLog.Log__c = '[{"TypeEncrypted":"53173e61ac22874aab5b8d1f802515db","Type":"*****","State":"鍖椾含甯�","ServiceUserId":"","RelatedHospital":"","RelatedDepartment":"","RegSource":"1","PersonManagementCode":"","NameEncrypted":"24616254c7c7b65d985567f475b667d7","Name":"***","MobileEncrypted":"c34725fe79b3965ea9abfd7c1435cf9a","Mobile":"***********","HospitalManagementCode2":"","ForbiddenStatus":false,"DepartmentName":"鍖椾含寰疯儨闂ㄤ腑鍖婚櫌 娑堝寲绉� 鑳冮暅瀹�","DepartmentManagementCode2":"","DepartmentClass":"娑堝寲绉�","DataId":"958432058273693696","ContactId":"958432058911227904","ContactAddressEncrypted":"121a09fd9e0e9b090c4aa9c95da52810","ContactAddress":"**********","City":"瑗垮煄鍖�","ApproverID":"om003669","AgentFlag":false,"AccountName":"鍖椾含寰疯儨闂ㄤ腑鍖婚櫌"}]';
//[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;
NFM624Rest.main(testLog.Id);
- BatchIF_Log__c testLog2 = new BatchIF_Log__c();
- testLog2.CurrencyIsoCode = 'CNY';
- testLog2.Type__c = 'NFM624';
- testLog2.MessageGroupNumber__c = '123456789987';
- // testLog.Name = '20211207';
- testLog2.ErrorLog__c = '';
- testLog2.MessageGroupNumber__c = '20211207';
- testLog2.RowDataFlg__c = true;
- testLog2.Log__c = '[{"Type":"鍖荤敓","State":"鍖椾含甯�","ServiceUserId":"","RelatedHospital":"","RelatedDepartment":"","RegSource":"1","PersonManagementCode":"","Name":"寮犱笁","Mobile":"17734281527","HospitalManagementCode2":"1118000","ForbiddenStatus":false,"DepartmentName":"娑堝寲绁炵粡绉�","DepartmentManagementCode2":"1118001","DepartmentClass":"娑堝寲绉�","ContactId":"1118002","ContactAddress":"鍖椾含甯傛湞闃冲尯浜┈妗�","City":"鏈濋槼鍖�","AgentFlag":false,"AccountName":"鎭╂儬鍖婚櫌"}]';
- //[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 testLog2;
- NFM624Rest.main(testLog2.Id);
+ // BatchIF_Log__c testLog2 = new BatchIF_Log__c();
+ // testLog2.CurrencyIsoCode = 'CNY';
+ // testLog2.Type__c = 'NFM624';
+ // testLog2.MessageGroupNumber__c = '123456789987';
+ // // testLog.Name = '20211207';
+ // testLog2.ErrorLog__c = '';
+ // testLog2.MessageGroupNumber__c = '20211207';
+ // testLog2.RowDataFlg__c = true;
+ // testLog2.Log__c = '[{"Type":"鍖荤敓","State":"鍖椾含甯�","ServiceUserId":"","RelatedHospital":"8087702","RelatedDepartment":"8087702","RegSource":"1","PersonManagementCode":"","Name":"寮犱笁","Mobile":"17734281527","HospitalManagementCode2":"1118000","ForbiddenStatus":false,"DepartmentName":"娑堝寲绁炵粡绉�","DepartmentManagementCode2":"1118001","DepartmentClass":"娑堝寲绉�","ContactId":"1118002","ContactAddress":"鍖椾含甯傛湞闃冲尯浜┈妗�","City":"鏈濋槼鍖�","AgentFlag":false,"AccountName":"鎭╂儬鍖婚櫌"}]';
+ // //[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 testLog2;
+ // NFM624Rest.main(testLog2.Id);
- BatchIF_Log__c testLog3 = new BatchIF_Log__c();
- testLog3.CurrencyIsoCode = 'CNY';
- testLog3.Type__c = 'NFM624';
- testLog3.MessageGroupNumber__c = '123456789987';
- // testLog.Name = '20211207';
- testLog3.ErrorLog__c = '';
- testLog3.MessageGroupNumber__c = '20211207';
- testLog3.RowDataFlg__c = true;
- testLog3.Log__c = '[{"Type":"鍖荤敓","State":"鍖椾含甯�","ServiceUserId":"","RelatedHospital":"","RelatedDepartment":"","RegSource":"1","PersonManagementCode":"","Name":"寮犱笁","Mobile":"17734281527","HospitalManagementCode2":"1118000","ForbiddenStatus":false,"DepartmentName":"娑堝寲绁炵粡绉�","DepartmentManagementCode2":"1118001","DepartmentClass":"娑堝寲绉�","ContactId":"1118002","ContactAddress":"鍖椾含甯傛湞闃冲尯浜┈妗�","City":"鏈濋槼鍖�","AgentFlag":false,"AccountName":"鎭╂儬鍖婚櫌"}]';
- //[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 testLog3;
- NFM624Rest.main(testLog3.Id);
+ // BatchIF_Log__c testLog3 = new BatchIF_Log__c();
+ // testLog3.CurrencyIsoCode = 'CNY';
+ // testLog3.Type__c = 'NFM624';
+ // testLog3.MessageGroupNumber__c = '123456789987';
+ // // testLog.Name = '20211207';
+ // testLog3.ErrorLog__c = '';
+ // testLog3.MessageGroupNumber__c = '20211207';
+ // testLog3.RowDataFlg__c = true;
+ // testLog3.Log__c = '[{"Type":"鍖荤敓","State":"鍖椾含甯�","ServiceUserId":"","RelatedHospital":"","RelatedDepartment":"","RegSource":"1","PersonManagementCode":"","Name":"寮犱笁","Mobile":"17734281527","HospitalManagementCode2":"1118000","ForbiddenStatus":false,"DepartmentName":"娑堝寲绁炵粡绉�","DepartmentManagementCode2":"1118001","DepartmentClass":"娑堝寲绉�","ContactId":"1118002","ContactAddress":"鍖椾含甯傛湞闃冲尯浜┈妗�","City":"鏈濋槼鍖�","AgentFlag":false,"AccountName":"鎭╂儬鍖婚櫌"}]';
+ // //[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 testLog3;
+ // NFM624Rest.main(testLog3.Id);
- BatchIF_Log__c testLog4 = new BatchIF_Log__c();
- testLog4.CurrencyIsoCode = 'CNY';
- testLog4.Type__c = 'NFM624';
- testLog4.MessageGroupNumber__c = '123456789987';
+ // BatchIF_Log__c testLog4 = new BatchIF_Log__c();
+ // testLog4.CurrencyIsoCode = 'CNY';
+ // testLog4.Type__c = 'NFM624';
+ // testLog4.MessageGroupNumber__c = '123456789987';
+ // // testLog.Name = '20211207';
+ // testLog4.ErrorLog__c = '';
+ // testLog4.MessageGroupNumber__c = '20211207';
+ // testLog4.RowDataFlg__c = true;
+ // testLog4.Log__c = '[{"Type":"鍖荤敓","State":"鍖椾含甯�","ServiceUserId":"","RelatedHospital":"","RelatedDepartment":"","RegSource":"1","PersonManagementCode":"","Name":"鑳栬揪","Mobile":"17734281527","HospitalManagementCode2":"1118000","ForbiddenStatus":true,"DepartmentName":"娑堝寲绁炵粡娣峰悎绉�","DepartmentManagementCode2":"1118004","DepartmentClass":"娑堝寲绉�","ContactId":"1118002","ContactAddress":"鍖椾含甯傛湞闃冲尯浜┈妗�","City":"鏈濋槼鍖�","AgentFlag":false,"AccountName":"鎭╂儬鍖婚櫌"}]';
+ // //[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 testLog4;
+ // NFM624Rest.main(testLog4.Id);
+
+ BatchIF_Log__c testLog5 = new BatchIF_Log__c();
+ testLog5.CurrencyIsoCode = 'CNY';
+ testLog5.Type__c = 'NFM624';
+ testLog5.MessageGroupNumber__c = '123456789987';
// testLog.Name = '20211207';
- testLog4.ErrorLog__c = '';
- testLog4.MessageGroupNumber__c = '20211207';
- testLog4.RowDataFlg__c = true;
- testLog4.Log__c = '[{"Type":"鍖荤敓","State":"鍖椾含甯�","ServiceUserId":"","RelatedHospital":"","RelatedDepartment":"","RegSource":"1","PersonManagementCode":"","Name":"鑳栬揪","Mobile":"17734281527","HospitalManagementCode2":"1118000","ForbiddenStatus":true,"DepartmentName":"娑堝寲绁炵粡娣峰悎绉�","DepartmentManagementCode2":"1118004","DepartmentClass":"娑堝寲绉�","ContactId":"1118002","ContactAddress":"鍖椾含甯傛湞闃冲尯浜┈妗�","City":"鏈濋槼鍖�","AgentFlag":false,"AccountName":"鎭╂儬鍖婚櫌"}]';
+ testLog5.ErrorLog__c = '';
+ testLog5.MessageGroupNumber__c = '20211207';
+ testLog5.RowDataFlg__c = true;
+ testLog5.Log__c = '[{"TypeEncrypted":"53173e61ac22874aab5b8d1f802515db","Type":"*****","State":"鍖椾含甯�","ServiceUserId":"958432058911227904","RelatedHospital":"3728239","RelatedDepartment":"5311053","RegSource":"1","PersonManagementCode":"","NameEncrypted":"24616254c7c7b65d985567f475b667d7","Name":"***","MobileEncrypted":"c34725fe79b3965ea9abfd7c1435cf9a","Mobile":"***********","HospitalManagementCode2":"1375","ForbiddenStatus":false,"DepartmentName":"鍖椾含寰疯儨闂ㄤ腑鍖婚櫌 娑堝寲绉� 鑳冮暅瀹�","DepartmentManagementCode2":"1376","DepartmentClass":"娑堝寲绉�","DataId":"958432058273693696","ContactId":"958432058911227904","ContactAddressEncrypted":"121a09fd9e0e9b090c4aa9c95da52810","ContactAddress":"**********","City":"瑗垮煄鍖�","ApproverID":"om003669","AgentFlag":false,"AccountName":"鍖椾含寰疯儨闂ㄤ腑鍖婚櫌"}]';
//[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 testLog4;
- NFM624Rest.main(testLog4.Id);
+ upsert testLog5;
+ NFM624Rest.main(testLog5.Id);
+ }
+ static testMethod void testMethod4(){
+ //鐢ㄦ埛
+ User hpowner = new User(Test_staff__c = true, LastName = 'hp', FirstName = 'owner', Alias = 'hp', Work_Location__c = '鍖椾含', CommunityNickname = 'hpOwner', Email = 'olympus_hpowner@sunbridge.com', Username = 'olympus_hpowner@sunbridge.com', IsActive = true, EmailEncodingKey = 'ISO-2022-JP', TimeZoneSidKey = 'Asia/Tokyo', LocaleSidKey = 'ja_JP', LanguageLocaleKey = 'ja', ProfileId = '00e10000000xnp2');
+ insert hpowner;
+
+ User hpowner2 = new User(Test_staff__c = true, LastName = 'hp1', FirstName = 'owner1', Alias = 'hp1', Work_Location__c = '鍖椾含', CommunityNickname = 'hpOwner1', Email = 'olympus_hpowner1@sunbridge.com', Username = 'olympus_hpowner1@sunbridge.com', IsActive = true, EmailEncodingKey = 'ISO-2022-JP', TimeZoneSidKey = 'Asia/Tokyo', LocaleSidKey = 'ja_JP', LanguageLocaleKey = 'ja', ProfileId = '00e10000000xnp2');
+ insert hpowner2;
+
+ //鍖婚櫌
+ Account hp = new Account(RecordTypeId = '01210000000QemG', Name = '鍖椾含寰疯儨闂ㄤ腑鍖婚櫌', OwnerId = hpOwner.Id);
+ hp.FSE_GI_Main_Leader__c = hpOwner.Id;
+ hp.Advance_Payment_Identification_Approval__c = Date.today().addyears(-1);
+ hp.AgentCode_Ext__c = '1375';
+ hp.PlatformCode__c = '112358';
+ hp.Is_Active__c = '鏈夊姽';
+ insert hp;
+
+
+ Account hptemp = [select Id,PlatformCode__c,AgentCode_Ext__c from Account where Id = :hp.Id];
+ //鎴樼暐绉戝
+ Account dc = [select Id, Name, RecordType_DeveloperName__c, Account2__c from Account where ParentId = :hp.Id and RecordType_DeveloperName__c = 'Department_Class_BF'];
+
+ NFM624Rest.GeData GeData1 = new NFM624Rest.GeData();
+ NFM624Rest.GeDatas GaDatas = new NFM624Rest.GeDatas();
+
+ Datetime nowDT = Datetime.now();
+ String nowStr = nowDT.format('yyyyMMddHHmm');
+ GaDatas.Monitoring = new NFMUtil.Monitoring();
+ GaDatas.Monitoring.MessageGroupNumber = nowStr + '01';
+
+ GaDatas.GeData = new NFM624Rest.Gedata[] { GeData1 };
+ GeData1.ContactId = '958432058911227904';
+ GeData1.ServiceUserId = '958432058911227904';
+ GeData1.PersonManagementCode = '';
+ GeData1.HospitalManagementCode2 = '1375';
+ GeData1.DepartmentManagementCode2 = '1376';
+ GeData1.Name = '***';
+ GeData1.NameEncrypted = '24616254c7c7b65d985567f475b667d7';
+ GeData1.Mobile = '***********';
+ GeData1.MobileEncrypted = 'c34725fe79b3965ea9abfd7c1435cf9a';
+ GeData1.State = '鍖椾含甯�';
+ GeData1.City = '瑗垮煄鍖�';
+ GeData1.AccountName = '鍖椾含寰疯儨闂ㄤ腑鍖婚櫌';
+ GeData1.RelatedHospital = '112358';
+ GeData1.DepartmentClass = '娑堝寲绉�';
+ GeData1.DepartmentName = '鍖椾含寰疯儨闂ㄤ腑鍖婚櫌 娑堝寲绉� 鑳冮暅瀹�';
+ GeData1.RelatedDepartment = '5311053';
+ GeData1.Type = '*****';
+ GeData1.TypeEncrypted = '53173e61ac22874aab5b8d1f802515db';
+ GeData1.ContactAddress = '**********';
+ GeData1.ContactAddressEncrypted = '121a09fd9e0e9b090c4aa9c95da52810';
+ GeData1.ForbiddenStatus = false;
+ GeData1.RegSource = '1';
+ GeData1.AgentFlag = false;
+ GeData1.ApproverID = hpowner.Id;
+ GeData1.DataId = '958432058273693696';
+
+ NFM624Rest.GeData GeData2 = new NFM624Rest.GeData();
+ GaDatas.GeData = new NFM624Rest.Gedata[] { GeData2 };
+ GeData2.ContactId = '';
+ GeData2.ServiceUserId = '';
+ GeData2.PersonManagementCode = '';
+ GeData2.HospitalManagementCode2 = hptemp.AgentCode_Ext__c;
+ GeData2.DepartmentManagementCode2 = '';
+ GeData2.Name = '';
+ GeData2.NameEncrypted = '';
+ GeData2.Mobile = '';
+ GeData2.MobileEncrypted = '';
+ GeData2.State = '';
+ GeData2.City = '';
+ GeData2.AccountName = '';
+ GeData2.RelatedHospital = hptemp.PlatformCode__c;
+ GeData2.DepartmentClass = '';
+ GeData2.DepartmentName = '';
+ GeData2.RelatedDepartment = '';
+ GeData2.Type = '';
+ GeData2.TypeEncrypted = '';
+ GeData2.ContactAddress = '';
+ GeData2.ContactAddressEncrypted = '';
+ GeData2.ForbiddenStatus = false;
+ GeData2.RegSource = '';
+ GeData2.AgentFlag = false;
+ GeData2.ApproverID = hpowner.Id;
+ GeData2.DataId = '';
+
+ System.Test.startTest();
+ BatchIF_Log__c rowData = NFMUtil.saveRowData(GaDatas.Monitoring, 'NFM624', GaDatas.GeData);
+ if (String.isBlank(rowData.Log__c) == false)
+ NFM624Rest.executefuture(rowData.Id);
+ //NFM110WebService.NFM110(ProductsDelivery);
+ System.Test.stopTest();
}
}
\ No newline at end of file
diff --git a/force-app/main/default/classes/UpdateContractAimAmountHandler.cls b/force-app/main/default/classes/UpdateContractAimAmountHandler.cls
index 3fbe80a..b2e4f4c 100644
--- a/force-app/main/default/classes/UpdateContractAimAmountHandler.cls
+++ b/force-app/main/default/classes/UpdateContractAimAmountHandler.cls
@@ -211,11 +211,7 @@
if (!NFM601_IdMap.containsKey(acc.Id)) {
// 鍒ゆ柇鏄惁鏄帴鍙ｇ敤鎴�
if(UserInfo.getUserId().equals(System.Label.interfaceUserID)){
- //姝ゅ鍋氫慨鏀癸紝NFM624Rest鎺ユ敹鏁版嵁鍚庤Е鍙憈rigger锛宼rigger鍐嶅幓璋冪敤601瀛樺湪bug锛屼慨鏀逛负澧炲姞鏍囪锛屼娇鐢˙atch鍙戦��
- //interfaceUserUpsertAccount.add(acc.Id);
- //2022-3-28 pk start
- acc.NFM601Tag__c = true;
- //2022-3-28 pk end
+ interfaceUserUpsertAccount.add(acc.Id);
} else {
queueableAccountIdList.add(acc.Id);
}
@@ -243,10 +239,7 @@
) {
if (!NFM601_IdMap.containsKey(acc.Id)) {
if(UserInfo.getUserId().equals(System.Label.interfaceUserID)){
- //interfaceUserUpsertAccount.add(acc.Id);
- //2022-3-28 pk start
- acc.NFM601tag__c = true;
- //2022-3-28 pk start
+ interfaceUserUpsertAccount.add(acc.Id);
} else {
queueableAccountIdList.add(acc.Id);
}
@@ -262,14 +255,14 @@
//After : to avoid mutiple execute
//if(!(System.Test.isRunningTest()||System.isFuture()||System.isBatch())){
//Update by Li Jun for PIPL 20220304
- if(!(System.Test.isRunningTest()||System.isFuture()||System.isBatch())){
+ if(!(System.Test.isRunningTest())){
if (queueableAccountIdList.size() > 0) {
NFM601Controller.callout('', queueableAccountIdList);
}
- // if (interfaceUserUpsertAccount.size() > 0) {
- // NFM601Controller.executefuture('', interfaceUserUpsertAccount);
- // }
+ if (interfaceUserUpsertAccount.size() > 0) {
+ NFM601Controller.executefuture('', interfaceUserUpsertAccount);
+ }
}
}
--
Gitblit v1.9.1