From e3c02c03dd2de442bbced87236f60a13a1cd154e Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期四, 02 三月 2023 17:51:57 +0800
Subject: [PATCH] gzw 正式环境最新代码更新
---
force-app/main/default/classes/NFM612Rest.cls | 68 ++++++++++++++++++++++++++--------
1 files changed, 52 insertions(+), 16 deletions(-)
diff --git a/force-app/main/default/classes/NFM612Rest.cls b/force-app/main/default/classes/NFM612Rest.cls
index 105bc7d..7ba17ef 100644
--- a/force-app/main/default/classes/NFM612Rest.cls
+++ b/force-app/main/default/classes/NFM612Rest.cls
@@ -18,9 +18,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; //璁惧澶х被
@@ -54,6 +54,11 @@
public String applicantId; //鐢宠淇悊浜虹紪鍙�
public String applyDate; //鐢宠鏃堕棿
public String repairOrderNo2FSEID; //鎶ヤ慨瀛愬崟鎵�灞濬SE鐨処D
+ // 2022/4/6 zhangyuheng update start
+ public String RepairFinishDate; //淇悊鍝佸鐞嗗畬鎴愭棩
+ public String ApplicanterPhone; //澶勭悊浜虹數璇�
+ public String CancelDate; //鍙楃悊浜哄彇娑堟姤淇棩
+ // 2022/4/6 zhangyuheng update end
// 涓婄嚎鍓� 鎶ヤ慨瀛愬崟涓庝慨鐞嗕笂鐨勭浉鍏冲瓧娈甸兘鍒犻櫎
public String responseResultsFirst; //涓婇棬搴斿缁撴灉(鏆傛椂娉ㄦ帀)
@@ -114,6 +119,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;
@@ -131,10 +137,12 @@
List < String > managementCodeList = new List < String > (); //瀛樻斁绉戝缂栫爜
List < String > rpersonList = new List < String > (); //瀛樻斁鎶ヤ慨浜虹敤鎴风紪鐮�
List < String > canIdList = new List < String > (); //瀛樻斁鍙栨秷浜虹敤鎴风紪鍙�
+ List < String > repairNoList = new List < String > (); //瀛樻斁鎶ヤ慨瀛愬崟鍙�
for (GeData ged: itemMasterList) {
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);
@@ -174,24 +182,29 @@
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();
@@ -202,6 +215,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; //鎶ヤ慨浜哄鍚�
@@ -226,17 +243,17 @@
repair.StartTimeFirst__c = NFMUtil.parseStr2DateTime(ged.repairOderInfo.startTimeFirst); //寮�濮嬫椂闂�
repair.EndTimeFirst__c = NFMUtil.parseStr2DateTime(ged.repairOderInfo.endTimeThird); //缁撴潫鏃堕棿
repair.FaultDescriptionFirst__c = ged.repairOderInfo.faultDescriptionFirst; //鏁呴殰鎻忚堪
- repair.ActualVisitTimeSecond__c = NFMUtil.parseStr2DateTime(ged.repairOderInfo.actualVisitTimeSecond); //浜屾涓婇棬鏃�
- repair.StartTimeSecond__c = NFMUtil.parseStr2DateTime(ged.repairOderInfo.startTimeSecond); //浜屾涓婇棬寮�濮嬫椂闂�
+ repair.ActualVisitTimeSecond__c = NFMUtil.parseStr2DateTime(ged.repairOderInfo.actualVisitTimeSecond); //浜屾涓婇棬鏃�--->浜屾璁″垝涓婇棬鏃�
+ repair.StartTimeSecond__c = NFMUtil.parseStr2DateTime(ged.repairOderInfo.startTimeSecond); //浜屾涓婇棬寮�濮嬫椂闂�--->浜屾涓婇棬鏃�
repair.EndTimeSecond__c = NFMUtil.parseStr2DateTime(ged.repairOderInfo.endTimeSecond); //浜屾涓婇棬缁撴潫鏃堕棿
repair.FaultDescriptionSecond__c = ged.repairOderInfo.faultDescriptionSecond; //浜屾鏁呴殰鎻忚堪
- repair.ActualVisitTimeThird__c = NFMUtil.parseStr2DateTime(ged.repairOderInfo.actualVisitTimeThird); //涓夋涓婇棬鏃�
- repair.StartTimeThird__c = NFMUtil.parseStr2DateTime(ged.repairOderInfo.startTimeThird); //涓夋涓婇棬寮�濮嬫椂闂�
+ repair.ActualVisitTimeThird__c = NFMUtil.parseStr2DateTime(ged.repairOderInfo.actualVisitTimeThird); //涓夋涓婇棬鏃�--->涓夋璁″垝涓婇棬鏃�
+ repair.StartTimeThird__c = NFMUtil.parseStr2DateTime(ged.repairOderInfo.startTimeThird); //涓夋涓婇棬寮�濮嬫椂闂�--->涓夋涓婇棬鏃�
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);//鐢宠淇悊浜虹紪鍙�
@@ -245,12 +262,22 @@
repair.Ownerid = canidMap.get(ged.repairOderInfo.repairOrderNo2FSEID).Id; //鎶ヤ慨瀛愬崟鎵�灞濬SE鐨処D
repair.AssetModel__c = ged.applyRepairInfo.equipmentModel; //璁惧鍨嬪彿
repair.AirframeCodeEngineer__c = ged.applyRepairInfo.equipmentCd; //鏈鸿韩缂栫爜(宸ョ▼甯�)
- repair.ResponseResultDesc__c = ged.applyRepairInfo.responseResultDesc; //搴斿鎻忚堪
+ repair.ResponseResultDesc__c = ged.applyRepairInfo.responseResultDesc; //搴斿鎻忚堪--->闂鎻忚堪锛堝伐绋嬪笀锛�
repair.ProcessResult__c = ged.applyRepairInfo.processResult; //澶勭悊缁撴灉
-
- if ('闂宸茶В鍐�'.equals(ged.applyRepairInfo.processResult)) {
- repair.Status__c = '鍏抽棴';
+ // 2022/4/6 zhangyuheng update start
+ repair.RepairFinishDate__c = NFMUtil.parseDateTimeStr2Date(ged.repairOderInfo.RepairFinishDate) ; //淇悊鍝佸鐞嗗畬鎴愭棩
+ repair.ApplicanterPhone__c = ged.repairOderInfo.ApplicanterPhone; //澶勭悊浜虹數璇�
+ repair.CancelleRepairTime__c = NFMUtil.parseDateTimeStr2Date(ged.repairOderInfo.CancelDate); //鍙楃悊浜哄彇娑堟姤淇棩
+ // repair.CancelleRepairTime__c = NFMUtil.parseStr2Date(ged.repairOderInfo.CancelDate); //鍙楃悊浜哄彇娑堟姤淇棩
+ repair.RepairCancelReason__c = ged.repairOderInfo.cancelReportReason; //淇悊鍙栨秷鍘熷洜
+ // 2022/4/6 zhangyuheng update 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 {
repair.Status__c = '寰呭鐞�';
@@ -270,10 +297,16 @@
repair.AttachmentName__c = attachmentName;
repairOrderNo2Str += repairOrderNo2 + '\n';
repairList.add(repair);
+ repairNoList.add(ged.repairOderInfo.repairOrderNo2);
}
-
- if (repairList.size() > 0) {
-
+ // 2022/4/6 zhangyuheng update start
+ List<RepairSubOrder__c> repairList1 = [SELECT Id FROM RepairSubOrder__c WHERE RepairSubOrderNo__c in: repairNoList];
+ if (repairList1.size() > 0) {
+ logstr += repairOrderNo2Str + ']-宸插瓨鍦�';
+ }
+ // if (repairList.size() > 0) {==== 2022/4/6 zhangyuheng娉ㄩ噴鎺�
+ else {
+ // 2022/4/6 zhangyuheng update end
insert repairList;
repairOrderNo2Str += ' ]\n';
logstr += repairOrderNo2Str + '鏂板瀹屾垚, 鏂板鎬绘暟鏁颁负锛�' + repairList.size() + '\n';
@@ -297,7 +330,7 @@
}
update rowData;
iflog.Log__c = logstr;
-
+ iflog.ErrorLog__c = logerr;//2022-07-11 zyh add
insert iflog;
}
/**
@@ -308,6 +341,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