From 45680dc03886f98506ed413b0be2b748eb75ffb2 Mon Sep 17 00:00:00 2001
From: 张宇恒 <bxyun0@163.com>
Date: 星期六, 07 五月 2022 17:50:26 +0800
Subject: [PATCH] 添加上下班时间判断、报价日数据处理、无messagegroupnumber的问题
---
force-app/main/default/classes/NFM603Controller.cls | 45 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 44 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/classes/NFM603Controller.cls b/force-app/main/default/classes/NFM603Controller.cls
index a94ba2a..5cc55e8 100644
--- a/force-app/main/default/classes/NFM603Controller.cls
+++ b/force-app/main/default/classes/NFM603Controller.cls
@@ -134,7 +134,7 @@
public static void executefuture(BatchIF_Log__c iflog, List < String > repairOrderIdList) {
Datetime nowDT = Datetime.now();
- String nowStr = nowDT.format('yyyyMMddHHmm');
+ String nowStr = nowDT.format('yyyyMMddHHmmss');
if (iflog != null) {
iflog.ErrorLog__c = '';
} else {
@@ -399,6 +399,14 @@
downEDt = DownEndDt();
upSDt = UpStartDt();
upEDt = UpEndDt();
+ // 2022-05-07 zyh update start
+ if (String.isNotBlank(info.FirstQuotationDate)) {
+ info.FirstQuotationDate = info.FirstQuotationDate.deleteWhitespace();
+ }
+ if (String.isNotBlank(info.quotationDate)) {
+ info.quotationDate = info.quotationDate.deleteWhitespace();
+ }
+ // 2022-05-07 zyh update end
//瀹氫箟涓嬬彮鏃堕棿
if (String.valueOf(info.FirstQuotationDate) >= String.valueOf(downSDt) && String.valueOf(info.FirstQuotationDate) <= String.valueOf(downEDt)) {
info.FirstQuotationDate = DownDt();//鍒濇鎶ヤ环鏃�
@@ -408,6 +416,21 @@
}
if (String.valueOf(info.quotationDate) >= String.valueOf(downSDt) && String.valueOf(info.quotationDate) <= String.valueOf(downEDt)) {
info.quotationDate = DownDt();//鎶ヤ环鏃�
+ }
+ if (String.valueOf(info.FSErepairApplyDate) >= String.valueOf(downSDt) && String.valueOf(info.FSErepairApplyDate) <= String.valueOf(downEDt)) {
+ info.FSErepairApplyDate = DownDt();//FSE淇悊鐢宠鏃堕棿 2022-05-06--zyh--add
+ }
+ if (String.valueOf(info.RCreturnDate) >= String.valueOf(downSDt) && String.valueOf(info.RCreturnDate) <= String.valueOf(downEDt)) {
+ info.RCreturnDate = DownDt();//RC淇悊鍝佽繑閫佹棩 2022-05-06--zyh--add
+ }
+ if (String.valueOf(info.finalTestDate) >= String.valueOf(downSDt) && String.valueOf(info.finalTestDate) <= String.valueOf(downEDt)) {
+ info.finalTestDate = DownDt();//10.鏈�缁堟娴嬫棩锛堝皬绋嬪簭锛� 2022-05-06--zyh--add
+ }
+ if (String.valueOf(info.userAgreeDAte) >= String.valueOf(downSDt) && String.valueOf(info.userAgreeDAte) <= String.valueOf(downEDt)) {
+ info.userAgreeDAte = DownDt();//7.鐢ㄦ埛鍚屾剰鏃ワ紙灏忕▼搴忥級 2022-05-06--zyh--add
+ }
+ if (String.valueOf(info.engineerSendDate) >= String.valueOf(downSDt) && String.valueOf(info.engineerSendDate) <= String.valueOf(downEDt)) {
+ info.engineerSendDate = DownDt();//宸ョ▼甯堜慨鐞嗗搧瀵勯�佹棩 2022-05-06--zyh--add
}
//瀹氫箟涓婄彮鏃堕棿
if (String.valueOf(info.FirstQuotationDate) >= String.valueOf(upSDt) && String.valueOf(info.FirstQuotationDate) <= String.valueOf(upEDt)) {
@@ -419,6 +442,21 @@
if (String.valueOf(info.quotationDate) >= String.valueOf(upSDt) && String.valueOf(info.quotationDate) <= String.valueOf(upEDt)) {
info.quotationDate = UpDt();//鎶ヤ环鏃�
}
+ if (String.valueOf(info.FSErepairApplyDate) >= String.valueOf(upSDt) && String.valueOf(info.FSErepairApplyDate) <= String.valueOf(upEDt)) {
+ info.FSErepairApplyDate = UpDt();//FSE淇悊鐢宠鏃堕棿 2022-05-06--zyh--add
+ }
+ if (String.valueOf(info.RCreturnDate) >= String.valueOf(upSDt) && String.valueOf(info.RCreturnDate) <= String.valueOf(upEDt)) {
+ info.RCreturnDate = UpDt();//RC淇悊鍝佽繑閫佹棩 2022-05-06--zyh--add
+ }
+ if (String.valueOf(info.finalTestDate) >= String.valueOf(upSDt) && String.valueOf(info.finalTestDate) <= String.valueOf(upEDt)) {
+ info.finalTestDate = UpDt();//10.鏈�缁堟娴嬫棩锛堝皬绋嬪簭锛� 2022-05-06--zyh--add
+ }
+ if (String.valueOf(info.userAgreeDAte) >= String.valueOf(upSDt) && String.valueOf(info.userAgreeDAte) <= String.valueOf(upEDt)) {
+ info.userAgreeDAte = UpDt();//7.鐢ㄦ埛鍚屾剰鏃ワ紙灏忕▼搴忥級 2022-05-06--zyh--add
+ }
+ if (String.valueOf(info.engineerSendDate) >= String.valueOf(upSDt) && String.valueOf(info.engineerSendDate) <= String.valueOf(upEDt)) {
+ info.engineerSendDate = UpDt();//宸ョ▼甯堜慨鐞嗗搧瀵勯�佹棩 2022-05-06--zyh--add
+ }
//鎶ヤ环鏃ャ�佸垵娆℃姤浠锋棩銆丷C淇悊鍝丷C鍙楃悊鏃ワ紙灏忕▼搴忥級鏃堕棿鍒ゆ柇 zyh 20220315 end
repairs.add(info);
System.debug('repairs1:' + repairs);
@@ -429,6 +467,11 @@
for (RepairOrderInfo roi : repairs ) {
repairs1.add(roi);
rowData = NFMUtil.makeRowData(iflog, LOG_TYPE, repairs1);
+ // 2022-05-07 zyh update start
+ if (String.isBlank(rowData.MessageGroupNumber__c)) {
+ rowData.MessageGroupNumber__c = nowStr;
+ }
+ // 2022-05-07 zyh update end
execute1(rowData, iflog);
// rowData = NFMUtil.makeRowData(iflog, LOG_TYPE, repairs);
// execute(rowData, iflog);
--
Gitblit v1.9.1