From f20f7ae7178f481e073c02161770fd20b121e6a9 Mon Sep 17 00:00:00 2001
From: 彭锟 <pengkun@prec-tech.com>
Date: 星期二, 29 三月 2022 17:44:41 +0800
Subject: [PATCH] Merge branch '624，601，606，相关更改'
---
force-app/main/default/classes/NFM601Batch.cls | 4 +
force-app/main/default/classes/NFM624BatchSchedulableTest.cls | 12 ++++
force-app/main/default/classes/NFM624BatchSchedulableTest.cls-meta.xml | 5 +
force-app/main/default/classes/NFM624BatchTest.cls-meta.xml | 5 +
force-app/main/default/classes/NFM601BatchTest.cls | 83 +++++++++++++++++++++++++++
force-app/main/default/classes/NFM624BatchTest.cls | 19 ++++++
force-app/main/default/classes/NFM601BatchTest.cls-meta.xml | 5 +
force-app/main/default/classes/NFM624Batch.cls | 4 +
8 files changed, 135 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/classes/NFM601Batch.cls b/force-app/main/default/classes/NFM601Batch.cls
index 05c17b5..e25b483 100644
--- a/force-app/main/default/classes/NFM601Batch.cls
+++ b/force-app/main/default/classes/NFM601Batch.cls
@@ -77,6 +77,8 @@
}
global void finish(Database.BatchableContext BC) {
- Id execBTId = Database.executeBatch(new NFM606Batch(), 200);
+ if(!Test.isRunningTest()){
+ Id execBTId = Database.executeBatch(new NFM606Batch(), 200);
+ }
}
}
\ No newline at end of file
diff --git a/force-app/main/default/classes/NFM601BatchTest.cls b/force-app/main/default/classes/NFM601BatchTest.cls
new file mode 100644
index 0000000..c4e89b7
--- /dev/null
+++ b/force-app/main/default/classes/NFM601BatchTest.cls
@@ -0,0 +1,83 @@
+@isTest
+public with sharing class NFM601BatchTest {
+ static testMethod void testMethod1() {
+ List<RecordType> Agency = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and DeveloperName = 'Agency'];
+ // 鍒涘缓缁忛攢鍟�
+ Account company = new Account();
+ company.RecordTypeId = Agency[0].Id;
+ company.Name = 'NFM601';
+ upsert company;
+ // 鍒涘缓缁忛攢瀹㈡埛浜哄憳
+ Contact contact = new Contact();
+ contact.AccountId = company.Id;
+ contact.FirstName = '璨换鑰�';
+ contact.LastName = '缁忛攢瀹㈡埛浜哄憳';
+ contact.recordtypeId = '01210000000QfWi';
+ contact.SendToComPlat__c = true;
+ contact.MobilePhone = '13409507069';
+ insert contact;
+
+ // 鍖婚櫌鐨勮褰曠被鍨�
+ List<RecordType> rectCo = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and DeveloperName = 'Hp'];
+ // 鎴樼暐绉戝 娑堝寲绉戠殑璁板綍绫诲瀷
+ List<RecordType> rectSct = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and DeveloperName = 'Department_Class_GI'];
+ // 娑堝寲绉戠殑璁板綍绫诲瀷
+ List<RecordType> rectDpt = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and DeveloperName = 'Department_GI'];
+
+ // 鐪�
+ Address_Level__c al = new Address_Level__c();
+ al.Name = '鏉变含';
+ al.Level1_Code__c = 'CN-99';
+ al.Level1_Sys_No__c = '999999';
+ insert al;
+ // 甯�
+ Address_Level2__c al2 = new Address_Level2__c();
+ al2.Level1_Code__c = 'CN-99';
+ al2.Level1_Sys_No__c = '999999';
+ al2.Level1_Name__c = '鏉变含';
+ al2.Name = '娓嬭胺鍖�';
+ al2.Level2_Code__c = 'CN-9999';
+ al2.Level2_Sys_No__c = '9999999';
+ al2.Address_Level__c = al.id;
+ insert al2;
+
+ Account hospital = new Account();
+ hospital.recordtypeId = rectCo[0].id;
+ hospital.Name = 'test hospital';
+ hospital.Is_Active__c = '鏈夊姽';
+ hospital.Attribute_Type__c = '鍗敓閮�';
+ hospital.Speciality_Type__c = '缁煎悎鍖婚櫌';
+ hospital.Grade__c = '涓�绾�';
+ hospital.OCM_Category__c = 'SLTV';
+ hospital.Is_Medical__c = '鍖荤枟鏈烘瀯';
+ hospital.State_Master__c = al.id;
+ hospital.City_Master__c = al2.id;
+ hospital.Town__c = '涓滀含';
+ insert hospital;
+
+ // 鎴︾暐绉戝銈掑緱銈�
+ Account[] strategicDep = [SELECT ID, Name FROM Account WHERE parentId = :hospital.Id AND recordType.DeveloperName = 'Department_Class_GI'];
+
+ Account dep = new Account();
+ dep.recordtypeId = rectDpt[0].id;
+ dep.Name = 'test dep';
+ dep.AgentCode_Ext__c = '9999998';
+ dep.ParentId = strategicDep[0].Id;
+ dep.Department_Class__c = strategicDep[0].Id;
+ dep.Hospital__c = hospital.Id;
+ dep.NFM601Tag__c = true;
+ insert dep;
+ // 鍖婚櫌瀹㈡埛浜哄憳
+ Contact contact2 = new Contact();
+ contact2.AccountId = dep.Id;
+ contact2.FirstName = '璨换鑰�';
+ contact2.LastName = '鍖婚櫌瀹㈡埛浜哄憳';
+ contact2.recordtypeId = '01210000000QfWdAAK';
+ contact2.SendToComPlat__c = true;
+ contact2.UnifiedI_Contact_ID__c = '20211117110643';
+ contact2.trigger606Flag__c = true;
+ insert contact2;
+ Database.executeBatch(new NFM601Batch());
+ Database.executeBatch(new NFM606Batch());
+ }
+}
diff --git a/force-app/main/default/classes/NFM601BatchTest.cls-meta.xml b/force-app/main/default/classes/NFM601BatchTest.cls-meta.xml
new file mode 100644
index 0000000..dd61d1f
--- /dev/null
+++ b/force-app/main/default/classes/NFM601BatchTest.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>
diff --git a/force-app/main/default/classes/NFM624Batch.cls b/force-app/main/default/classes/NFM624Batch.cls
index b78e5b1..8c77de7 100644
--- a/force-app/main/default/classes/NFM624Batch.cls
+++ b/force-app/main/default/classes/NFM624Batch.cls
@@ -24,6 +24,8 @@
// if(updateprocessingList.size()>0){
// update updateprocessingList;
// }
-
+ if(!Test.isRunningTest()){
+ Id execBTId = Database.executeBatch(new NFM601Batch(), 200);
+ }
}
}
\ No newline at end of file
diff --git a/force-app/main/default/classes/NFM624BatchSchedulableTest.cls b/force-app/main/default/classes/NFM624BatchSchedulableTest.cls
new file mode 100644
index 0000000..0843414
--- /dev/null
+++ b/force-app/main/default/classes/NFM624BatchSchedulableTest.cls
@@ -0,0 +1,12 @@
+@isTest
+public with sharing class NFM624BatchSchedulableTest {
+ @isTest static void test_method_one() {
+ // Implement test code
+ String CRON_EXP = '0 0 0 3 9 ? 2022';
+ System.Test.startTest();
+ String jobId = system.schedule('NFM624BatchSchedulableTest', CRON_EXP, new NFM624BatchSchedulable());
+ // Get the information from the CronTrigger API object
+
+ System.Test.StopTest();
+ }
+}
diff --git a/force-app/main/default/classes/NFM624BatchSchedulableTest.cls-meta.xml b/force-app/main/default/classes/NFM624BatchSchedulableTest.cls-meta.xml
new file mode 100644
index 0000000..dd61d1f
--- /dev/null
+++ b/force-app/main/default/classes/NFM624BatchSchedulableTest.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>
diff --git a/force-app/main/default/classes/NFM624BatchTest.cls b/force-app/main/default/classes/NFM624BatchTest.cls
new file mode 100644
index 0000000..9d532ce
--- /dev/null
+++ b/force-app/main/default/classes/NFM624BatchTest.cls
@@ -0,0 +1,19 @@
+@isTest
+public with sharing class NFM624BatchTest {
+ static testMethod void testMethod1() {
+ BatchIF_Log__c testLog = new BatchIF_Log__c();
+ testLog.CurrencyIsoCode = 'CNY';
+ testLog.Type__c = 'NFM624';
+ testLog.MessageGroupNumber__c = '123456789987';
+ // testLog.Name = '20211207';
+ testLog.ErrorLog__c = '';
+ testLog.MessageGroupNumber__c = '20211207';
+ testLog.RowDataFlg__c = true;
+ testLog.retry_cnt__c = 0;
+ testLog.Log__c = '[{"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":"鍖椾含澶у绗笁鍖婚櫌"}]';
+ testLog.NFM624_Secondary_processing__c = false;
+ //[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;
+ Database.executeBatch(new NFM624Batch(),1);
+ }
+}
diff --git a/force-app/main/default/classes/NFM624BatchTest.cls-meta.xml b/force-app/main/default/classes/NFM624BatchTest.cls-meta.xml
new file mode 100644
index 0000000..dd61d1f
--- /dev/null
+++ b/force-app/main/default/classes/NFM624BatchTest.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