From d8dc84a3d56df839895f1c417a4d9cbee763d262 Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期五, 03 三月 2023 14:50:59 +0800
Subject: [PATCH] gzw 测试环境代码更新
---
force-app/main/default/classes/NFM612Rest.cls | 133 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 124 insertions(+), 9 deletions(-)
diff --git a/force-app/main/default/classes/NFM612Rest.cls b/force-app/main/default/classes/NFM612Rest.cls
index 9918df4..cd6eaf5 100644
--- a/force-app/main/default/classes/NFM612Rest.cls
+++ b/force-app/main/default/classes/NFM612Rest.cls
@@ -8,6 +8,8 @@
global class GeData {
public RepairOderInfo repairOderInfo;
public ApplyRepairInfo applyRepairInfo;
+ public problem problem;
+ public isOts isOts;
}
//鎶ヤ慨鍗曚俊鎭�
public class RepairOderInfo {
@@ -18,9 +20,9 @@
public String departmentCd; //鎶ヤ慨绉戝缂栫爜
public String repairApplyPerson; //鎶ヤ慨浜虹敤鎴风紪鐮�
public String repairApplicantName; //鎶ヤ慨浜哄鍚�
- public String repairApplicantNameEncrypted; //鎶ヤ慨浜哄鍚嶅瘑鏂� add20220214
+ //public String repairApplicantNameEncrypted; //鎶ヤ慨浜哄鍚嶅瘑鏂� add20220214 //zhj鏂版柟妗堟敼閫� 2022-12-07
public String repairApplyPersonTel; //鎶ヤ慨浜鸿仈绯讳汉鐢佃瘽
- public String repairApplyPersonTelEncrypted;//淇濅慨浜鸿仈绯荤數璇� 瀵嗘枃 add 20220214
+ //public String repairApplyPersonTelEncrypted;//淇濅慨浜鸿仈绯荤數璇� 瀵嗘枃 add 20220214 //zhj鏂版柟妗堟敼閫� 2022-12-07
public String DataId;//aws 瀛樺偍鍑瘉 add 20220214
public String repairApplyType; // 鎶ヤ慨浜哄矖浣�
public String equipmentCategory; //璁惧澶х被
@@ -69,6 +71,9 @@
public String cancelleRepairDate; //鍙栨秷鎶ヤ慨鏃�
public String cancelReportReason; //鍙栨秷鎶ヤ慨鍘熷洜
+
+
+
}
//璁惧淇℃伅
@@ -77,6 +82,46 @@
public String equipmentCd; //鏈鸿韩缂栫爜(宸ョ▼甯�)
public String responseResultDesc; //搴斿鎻忚堪
public String processResult; //澶勭悊缁撴灉
+ }
+ //鏁呴殰澶勭悊淇℃伅
+ public class problem {
+ public String dateReceiptQuestions; //鎶曡瘔鐭ユ倝鏃ワ紙Complaint Aware Date锛�
+ public String ifDeadHurt; //鏄惁鏈夋浜°�佷激瀹炽�佹劅鏌�
+ public String problemOccurred; //闂鍙戠敓鏃堕棿鎯呭喌
+ public String problemOccurredSelect; //闂鍙戠敓鏃堕棿鎯呭喌 鍏朵粬
+ public String reportAdverseEvents; //鍖婚櫌鏈夋病鏈夊悜鏀垮簻鏈哄叧鎶ュ憡涓嶈壇浜嬩欢鎴栫枒浼间笉鑹簨浠�
+ public String whatProject; //鍋氱殑鏄摢涓」鐩�
+ public String operationOrExaminationName; //鎵嬫湳/妫�鏌ュ悕绉�
+ public String breakORFallOff; //鏄惁鏈夊彂鐢熸柇瑁傛垨鑴辫惤
+ public String useFailProductFinish; //鏄惁鐢ㄨ浜у搧瀹屾垚浜嗘墜鏈�/妫�鏌�
+ public String supportingProducts; //閰嶅浣跨敤浜у搧
+ public String afterFailureInformation; //鍙戠幇鏁呴殰鍚庯紝鍖婚櫌瀵规偅鑰呯殑澶勭悊鎯呭喌
+ public String delay15Min; //鍙戠幇鏁呴殰鐜拌薄鍚庯紝鏈夊欢璇�15鍒嗛挓浠ヤ笂鐨勬墜鏈疄鏂界殑鎯呭喌鍙戠敓鍚�
+ public String informationFrom; //淇℃伅鏄粠鍖婚櫌鐨勮皝閭ｉ噷寰楀埌鐨�
+ public String failureQInHospital; //鍦ㄥ尰闄紝鏁呴殰鍙戠敓鐨勯鐜囨槸澶氬皯
+ public String delayReportReason; //瓒呮椂鎶ュ憡鐨勭悊鐢�
+ public String isProductFaultRelated; //鏄惁涓庤繖娆′骇鍝佹晠闅滅浉鍏�
+ }
+ //鐗╂祦
+ public class isOts {
+ public String senderOrgCode; //閫佷慨鏈烘瀯浠ｇ爜
+ public String senderCompany; //閫佷慨鏈烘瀯鍚嶇О
+ public String senderName; //閫佷慨浜哄鍚�
+ public String senderMobilePhone; //閫佷慨浜烘墜鏈�
+ public String senderAddress; //閫佷慨浜哄湴鍧�
+ public String recepientCompany; //鎺ユ敹鏈烘瀯鍚嶇О
+ public String recepientName; //鎺ユ敹閫佷慨浜哄鍚�
+ public String recepientMobilePhone; //鎺ユ敹浜烘墜鏈�
+ public String recepientAddress; //鎺ユ敹浜哄湴鍧�
+ public String returnWayType; //杩斿搧鏂瑰紡
+ public String orderNumber; //閫佷慨鐗╂祦鍗曞彿
+ public String failureReason; //涓嬪崟澶辫触鍘熷洜
+ public String logisticsSendDate; //閫佷慨鐗╂祦鍙戦�佹棩
+ public String item0010; //澶囩敤瀛楁1
+ public String item0020; //澶囩敤瀛楁2
+ public String item0030; //澶囩敤瀛楁3
+ public String item0040; //澶囩敤瀛楁4
+ public String item0050; //澶囩敤瀛楁5
}
@HttpPost
global static void doPost() {
@@ -119,6 +164,7 @@
global static void main(String rowData_Id) {
BatchIF_Log__c rowData = [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 from BatchIF_Log__c where RowDataFlg__c = true and Id =: rowData_Id];
String logstr = ' start\n';
+ String logerr = '';
BatchIF_Log__c iflog = new BatchIF_Log__c();
iflog.Type__c = LOG_TYPE;
iflog.MessageGroupNumber__c = rowData.MessageGroupNumber__c;
@@ -130,6 +176,11 @@
return;
}
Savepoint sp = Database.setSavepoint();
+ /*List<RepairSubOrder__c> rsoList = [SELECT Id FROM RepairSubOrder__c WHERE Name = ged.repairOderInfo.repairOrderNo2];
+ if (rsoList.size() > 0) {
+
+ }
+*/
try {
List < RepairSubOrder__c > repairList = new List < RepairSubOrder__c > ();
Map < String, GeData > gedMap = new Map < String, GeData > ();
@@ -141,6 +192,7 @@
String dataComplete = verify(ged);
if (!String.isBlank(dataComplete)) {
logstr += dataComplete;
+ logerr += '鎶ヤ慨瀛愬崟No['+ged.repairOderInfo.repairOrderNo2+']\n' + logstr; //2022-07-11 zyh add
continue;
}
gedMap.put(ged.repairOderInfo.repairOrderNo2, ged);
@@ -175,29 +227,35 @@
// 闄勪欢涓嬭浇鏍囪
Boolean attachmentDownloadFlg = false;
String repairOrderNo2Str = '鎶ヤ慨瀛愬崟No [ \n';
+ Map<String,RepairSubOrder__c> RsoMap = new Map<String,RepairSubOrder__c>();
for (String repairOrderNo2: gedMap.keySet()) {
GeData ged = gedMap.get(repairOrderNo2);
if (!accountMap.containsKey(ged.repairOderInfo.departmentCd)) {
logstr += ged.repairOderInfo.departmentCd + '璇ョ瀹や笉瀛樺湪,姝ゆ潯鏁版嵁璺宠繃!';
+ logerr += '鎶ヤ慨瀛愬崟No['+repairOrderNo2+']\n' + logstr; //2022-07-11 zyh add
continue;
}
if (String.isNotBlank(ged.repairOderInfo.repairApplyPerson) && !personMap.containsKey(ged.repairOderInfo.repairApplyPerson)) {
logstr += ged.repairOderInfo.repairApplyPerson + '鎶ヤ慨浜虹敤鎴风紪鐮佷笉瀛樺湪,姝ゆ潯鏁版嵁璺宠繃';
+ logerr += '鎶ヤ慨瀛愬崟No['+repairOrderNo2+']\n' + logstr; //2022-07-11 zyh add
continue;
}
if (!personMap.containsKey(ged.repairOderInfo.receiverId)) {
logstr += ged.repairOderInfo.receiverId + '鍙楃悊浜虹敤鎴风紪鍙蜂笉瀛樺湪,姝ゆ潯鏁版嵁璺宠繃';
+ logerr += '鎶ヤ慨瀛愬崟No['+repairOrderNo2+']\n' + logstr; //2022-07-11 zyh add
continue;
}
if ('鐢宠淇悊'.equals(ged.applyRepairInfo.processResult) && !personMap.containsKey(ged.repairOderInfo.applicantId)) {
logstr += ged.repairOderInfo.applicantId + '鐢宠淇悊浜虹紪鍙蜂笉瀛樺湪,姝ゆ潯鏁版嵁璺宠繃';
+ logerr += '鎶ヤ慨瀛愬崟No['+repairOrderNo2+']\n' + logstr; //2022-07-11 zyh add
continue;
}
if (!canidMap.containsKey(ged.repairOderInfo.repairOrderNo2FSEID)) {
logstr += ged.repairOderInfo.repairOrderNo2FSEID + '鎶ヤ慨瀛愬崟鎵�灞濬SE鐨処D涓嶅瓨鍦�,姝ゆ潯鏁版嵁璺宠繃';
+ logerr += '鎶ヤ慨瀛愬崟No['+repairOrderNo2+']\n' + logstr; //2022-07-11 zyh add
continue;
}
RepairSubOrder__c repair = new RepairSubOrder__c();
@@ -208,6 +266,10 @@
repair.Hospital__c = dep.Parent.ParentId; //鎶ヤ慨鍖婚櫌缂栫爜
repair.StrategicDepartment__c = dep.ParentId; //鎴樼暐绉戝
repair.Department__c = dep.Id; //鎶ヤ慨绉戝缂栫爜
+ //XLIU-CFZ3AR LY 20220705 Start
+ system.debug('12121121'+dep.Province_formula__c);
+ repair.State__c = dep.Province_formula__c; //鐪�
+ //XLIU-CFZ3AR LY 20220705 End
repair.RepairApplicant__c = personMap.get(ged.repairOderInfo.repairApplyPerson); //鎶ヤ慨浜虹敤鎴风紪鐮�
repair.RepairApplicantName__c = ged.repairOderInfo.repairApplicantName; //鎶ヤ慨浜哄鍚�
@@ -241,8 +303,8 @@
repair.EndTimeThird__c = NFMUtil.parseStr2DateTime(ged.repairOderInfo.endTimeThird); //涓夋涓婇棬缁撴潫鏃堕棿
repair.FaultDescriptionThird__c = ged.repairOderInfo.faultDescriptionThird; //涓夋鏁呴殰鎻忚堪
repair.ApplicantType__c = ged.repairOderInfo.applicantType; //鐢宠淇悊浜虹被鍨�
- repair.RepairApplicantName_Encrypted__c =ged.repairOderInfo.repairApplicantNameEncrypted; //鎶ヤ慨浜哄鍚嶅瘑鏂� add 20220214
- repair.RepairApplicantTel_Encrypted__c = ged.repairOderInfo.repairApplyPersonTelEncrypted;//淇濅慨浜鸿仈绯荤數璇濆瘑鏂� add 20220214
+ //repair.RepairApplicantName_Encrypted__c =ged.repairOderInfo.repairApplicantNameEncrypted; //鎶ヤ慨浜哄鍚嶅瘑鏂� add 20220214 //zhj 鏂版柟妗堟敼閫� 2022-12-09
+ //repair.RepairApplicantTel_Encrypted__c = ged.repairOderInfo.repairApplyPersonTelEncrypted;//淇濅慨浜鸿仈绯荤數璇濆瘑鏂� add 20220214 //zhj 鏂版柟妗堟敼閫� 2022-12-09
repair.AWS_Data_Id__c =ged.repairOderInfo.DataId;//AWS 瀛樺偍鍑瘉 add 20220214
// repair.Applicant__c = canidMap.get(ged.repairOderInfo.applicantId).Id; //鐢宠淇悊浜虹紪鍙�
repair.Applicanter__c = personMap.get(ged.repairOderInfo.applicantId);//鐢宠淇悊浜虹紪鍙�
@@ -261,8 +323,45 @@
// repair.CancelleRepairTime__c = NFMUtil.parseStr2Date(ged.repairOderInfo.CancelDate); //鍙楃悊浜哄彇娑堟姤淇棩
repair.RepairCancelReason__c = ged.repairOderInfo.cancelReportReason; //淇悊鍙栨秷鍘熷洜
// 2022/4/6 zhangyuheng update end
-
- if ('闂宸茶В鍐�'.equals(ged.applyRepairInfo.processResult)) {
+ // 2023-02-20 zyh add start
+ repair.DateReceiptQuestions__c = ged.problem.dateReceiptQuestions; //鎶曡瘔鐭ユ倝鏃ワ紙Complaint Aware Date锛�
+ repair.IfDeadHurt__c = ged.problem.ifDeadHurt; //鏄惁鏈夋浜°�佷激瀹炽�佹劅鏌�
+ repair.ProblemOccurred__c = ged.problem.problemOccurred; //闂鍙戠敓鏃堕棿鎯呭喌
+ repair.ProblemOccurredSelect__c = ged.problem.problemOccurredSelect; //闂鍙戠敓鏃堕棿鎯呭喌 鍏朵粬
+ repair.ReportAdverseEvents__c = ged.problem.reportAdverseEvents; //鍖婚櫌鏈夋病鏈夊悜鏀垮簻鏈哄叧鎶ュ憡涓嶈壇浜嬩欢鎴栫枒浼间笉鑹簨浠�
+ repair.WhatProject__c = ged.problem.whatProject; //鍋氱殑鏄摢涓」鐩�
+ repair.OperationOrExaminationName__c = ged.problem.operationOrExaminationName; //鎵嬫湳/妫�鏌ュ悕绉�
+ repair.BreakORFallOff__c = ged.problem.breakORFallOff; //鏄惁鏈夊彂鐢熸柇瑁傛垨鑴辫惤
+ repair.UseFailProductFinish__c = ged.problem.useFailProductFinish; //鏄惁鐢ㄨ浜у搧瀹屾垚浜嗘墜鏈�/妫�鏌�
+ repair.SupportingProducts__c = ged.problem.supportingProducts; //閰嶅浣跨敤浜у搧
+ repair.AfterFailureInformation__c = ged.problem.afterFailureInformation; //鍙戠幇鏁呴殰鍚庯紝鍖婚櫌瀵规偅鑰呯殑澶勭悊鎯呭喌
+ repair.Delay15Min__c = ged.problem.delay15Min; //鍙戠幇鏁呴殰鐜拌薄鍚庯紝鏈夊欢璇�15鍒嗛挓浠ヤ笂鐨勬墜鏈疄鏂界殑鎯呭喌鍙戠敓鍚�
+ repair.InformationFrom__c = ged.problem.informationFrom; //淇℃伅鏄粠鍖婚櫌鐨勮皝閭ｉ噷寰楀埌鐨�
+ repair.FailureQInHospital__c = ged.problem.failureQInHospital; //鍦ㄥ尰闄紝鏁呴殰鍙戠敓鐨勯鐜囨槸澶氬皯
+ repair.DelayReportReason__c = ged.problem.delayReportReason; //瓒呮椂鎶ュ憡鐨勭悊鐢�
+ repair.IsProductFaultRelated__c = ged.problem.isProductFaultRelated; //鏄惁涓庤繖娆′骇鍝佹晠闅滅浉鍏�
+ repair.SenderOrgCode__c = ged.isOts.senderOrgCode; //閫佷慨鏈烘瀯浠ｇ爜
+ repair.SenderCompany__c = ged.isOts.senderCompany; //閫佷慨鏈烘瀯鍚嶇О
+ repair.SenderName__c = ged.isOts.senderName; //閫佷慨浜哄鍚�
+ repair.SenderMobilePhone__c = ged.isOts.senderMobilePhone; //閫佷慨浜烘墜鏈�
+ repair.SenderAddress__c = ged.isOts.senderAddress; //閫佷慨浜哄湴鍧�
+ repair.RecepientCompany__c = ged.isOts.recepientCompany; //鎺ユ敹鏈烘瀯鍚嶇О
+ repair.RecepientName__c = ged.isOts.recepientName; //鎺ユ敹閫佷慨浜哄鍚�
+ repair.RecepientMobilePhone__c = ged.isOts.recepientMobilePhone; //鎺ユ敹浜烘墜鏈�
+ repair.RecepientAddress__c = ged.isOts.recepientAddress; //鎺ユ敹浜哄湴鍧�
+ repair.ReturnWayType__c = ged.isOts.returnWayType; //杩斿搧鏂瑰紡
+ repair.OrderNumber__c = ged.isOts.orderNumber; //閫佷慨鐗╂祦鍗曞彿
+ repair.FailureReason__c = ged.isOts.failureReason; //涓嬪崟澶辫触鍘熷洜
+ repair.LogisticsSendDate__c = ged.isOts.logisticsSendDate; //閫佷慨鐗╂祦鍙戦�佹棩
+ repair.Item0010__c = ged.isOts.item0010; //澶囩敤瀛楁1
+ repair.Item0020__c = ged.isOts.item0020; //澶囩敤瀛楁2
+ repair.Item0030__c = ged.isOts.item0030; //澶囩敤瀛楁3
+ repair.Item0040__c = ged.isOts.item0040; //澶囩敤瀛楁4
+ repair.Item0050__c = ged.isOts.item0050; //澶囩敤瀛楁5
+ // 2023-02-20 zyh add end
+ //LLIU-CG53S9 20220715 LY start
+ if ('闂宸茶В鍐�'.equals(ged.applyRepairInfo.processResult) ||'闇�鍋氳川閲忓垽瀹�'.equals(ged.applyRepairInfo.processResult) ||'鐢ㄦ埛閫夋嫨涓嶄慨鐞�'.equals(ged.applyRepairInfo.processResult)) {
+ //LLIU-CG53S9 20220715 LY end
// repair.Status__c = '鍏抽棴';
repair.Status__c = '宸插畬鎴�'; // 2022/4/6 zhangyuheng
} else {
@@ -285,11 +384,24 @@
repairOrderNo2Str += repairOrderNo2 + '\n';
repairList.add(repair);
repairNoList.add(ged.repairOderInfo.repairOrderNo2);
+ RsoMap.put(ged.repairOderInfo.repairOrderNo2,repair);
}
// 2022/4/6 zhangyuheng update start
- List<RepairSubOrder__c> repairList1 = [SELECT Id FROM RepairSubOrder__c WHERE RepairSubOrderNo__c in: repairNoList];
- if (repairList1.size() > 0) {
+ List<RepairSubOrder__c> upList = new List<RepairSubOrder__c>();
+ List<RepairSubOrder__c> repairSOList1 = [SELECT Id,RepairSubOrderNo__c,DateReceiptQuestions__c FROM RepairSubOrder__c WHERE RepairSubOrderNo__c in: repairNoList];
+ if (repairSOList1.size() > 0) {
+ for(RepairSubOrder__c rso: repairSOList1){
+ if(RsoMap.containsKey(rso.RepairSubOrderNo__c)){
+ RepairSubOrder__c temp = new RepairSubOrder__c();
+ temp = RsoMap.get(rso.RepairSubOrderNo__c);
+ temp.Id = rso .Id;
+ upList.add(temp);
+ }
+ }
logstr += repairOrderNo2Str + ']-宸插瓨鍦�';
+ update upList;
+ System.debug(repairSOList1[0].Id + '===' + repairSOList1[0].DateReceiptQuestions__c);
+ logstr += repairOrderNo2Str + '鏇存柊瀹屾垚, 鏇存柊鎬绘暟涓猴細' + repairSOList1.size() + '\n' + repairSOList1;
}
// if (repairList.size() > 0) {==== 2022/4/6 zhangyuheng娉ㄩ噴鎺�
else {
@@ -317,7 +429,7 @@
}
update rowData;
iflog.Log__c = logstr;
-
+ iflog.ErrorLog__c = logerr;//2022-07-11 zyh add
insert iflog;
}
/**
@@ -328,6 +440,9 @@
private static Map < String, Account > getAccountMap(List < String > managementCodeList) {
List < Account > accountList =
[SELECT id, Management_Code__c, ParentId, Parent.ParentId
+ //XLIU-CFZ3AR LY 20220705 Start
+ ,Province_formula__c
+ //XLIU-CFZ3AR LY 20220705 End
FROM Account
WHERE Management_Code__c
IN: managementCodeList
--
Gitblit v1.9.1