From 8badb57ea2c82557850ad5b39281c3e8714eb119 Mon Sep 17 00:00:00 2001
From: liuyan <liuyan@prec-tech.com>
Date: 星期四, 24 十一月 2022 10:08:31 +0800
Subject: [PATCH] 科室信息漏传SPO问题
---
force-app/main/default/classes/NFM612Rest.cls | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/classes/NFM612Rest.cls b/force-app/main/default/classes/NFM612Rest.cls
index 2209306..9918df4 100644
--- a/force-app/main/default/classes/NFM612Rest.cls
+++ b/force-app/main/default/classes/NFM612Rest.cls
@@ -57,6 +57,7 @@
// 2022/4/6 zhangyuheng update start
public String RepairFinishDate; //淇悊鍝佸鐞嗗畬鎴愭棩
public String ApplicanterPhone; //澶勭悊浜虹數璇�
+ public String CancelDate; //鍙楃悊浜哄彇娑堟姤淇棩
// 2022/4/6 zhangyuheng update end
// 涓婄嚎鍓� 鎶ヤ慨瀛愬崟涓庝慨鐞嗕笂鐨勭浉鍏冲瓧娈甸兘鍒犻櫎
@@ -135,6 +136,7 @@
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)) {
@@ -249,17 +251,20 @@
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; //澶勭悊缁撴灉
// 2022/4/6 zhangyuheng update start
- repair.RepairFinishDate__c = NFMUtil.parseStr2Date(ged.repairOderInfo.RepairFinishDate) ; //淇悊鍝佸鐞嗗畬鎴愭棩
+ 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
if ('闂宸茶В鍐�'.equals(ged.applyRepairInfo.processResult)) {
- repair.Status__c = '鍏抽棴';
+ // repair.Status__c = '鍏抽棴';
+ repair.Status__c = '宸插畬鎴�'; // 2022/4/6 zhangyuheng
} else {
repair.Status__c = '寰呭鐞�';
@@ -279,10 +284,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';
--
Gitblit v1.9.1