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/InspectionReportTriggerHandler.cls | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/force-app/main/default/classes/InspectionReportTriggerHandler.cls b/force-app/main/default/classes/InspectionReportTriggerHandler.cls
index aa7acbe..2a602b0 100644
--- a/force-app/main/default/classes/InspectionReportTriggerHandler.cls
+++ b/force-app/main/default/classes/InspectionReportTriggerHandler.cls
@@ -331,7 +331,9 @@
for (String iPId : IPIdSet) {
// add 濡傛灉 瓒呭嚭鐐规鍖洪棿=true 鍒欎釜鐐规璁″垝鏁版嵁涓嶈绠� fxk 2021/10/20 Star
System.debug('瓒呭嚭'+overstepMap.get(iPId+'overstep'));
- if(!overstepMap.containskey(iPId)){
+ // gzw 鐐规鍘嗗彶鏁版嵁涔熻鏇存柊鎵ц寮�濮嬫棩鍜屽畬鎴愭棩 start
+ // if(!overstepMap.containskey(iPId)){
+ // gzw 鐐规鍘嗗彶鏁版嵁涔熻鏇存柊鎵ц寮�濮嬫棩鍜屽畬鎴愭棩 end
// add 濡傛灉 瓒呭嚭鐐规鍖洪棿=true 鍒欎釜鐐规璁″垝鏁版嵁涓嶈绠� fxk 2021/10/20 End
Inspectup_Plan__c IPlanInfo = new Inspectup_Plan__c();
IPlanInfo.Id = iPId;
@@ -342,6 +344,10 @@
// if (SumNumMap.size() > 0) {
if (SumNumMap != null && SumNumMap.size() > 0 ) {
// 20210911 gzw bug fix end
+ // gzw 鐐规鍘嗗彶鏁版嵁涔熻鏇存柊鎵ц寮�濮嬫棩鍜屽畬鎴愭棩 start
+ // 瀹為檯鎵ц鏁�
+ Integer actualQ = 0;
+ if(!overstepMap.containskey(iPId)){
if (PlanToAssetMap.containsKey(iPId + sumNumsList[0])) {
IPlanInfo.Actual_Execution_Quantity__c = PlanToAssetMap.get(iPId + sumNumsList[0]).size();//瀹為檯鐐规璁惧鏁� 鍘婚噸
}
@@ -357,26 +363,28 @@
if (PlanToAssetMap.containsKey(iPId + sumNumsList[3])) {
IPlanInfo.Abandonment_Number__c = PlanToAssetMap.get(iPId + sumNumsList[3]).size();//鐐规璁″垝 鏀惧純璁惧鏁�
}
- System.debug('-------131------' + IPlanInfo.Planned_check_equipment_Num__c);
- System.debug('-------121------' + SumNumMap.get(iPId + sumNumsList[5]));
- if (IPlanInfo.Actual_Execution_Quantity__c == SumNumMap.get(iPId + sumNumsList[5])) {
- System.debug('-------13------' + IPlanInfo.Actual_Execution_Quantity__c);
- System.debug('-------12------' + SumNumMap.get(iPId + sumNumsList[5]));
+ }else {
+ if (PlanToAssetMap.containsKey(iPId + sumNumsList[0])) {
+ actualQ = PlanToAssetMap.get(iPId + sumNumsList[0]).size();//瀹為檯鐐规璁惧鏁� 鍘婚噸
+ }
+ }
+ // gzw 鐐规鍘嗗彶鏁版嵁涔熻鏇存柊鎵ц寮�濮嬫棩鍜屽畬鎴愭棩 start
+ if (IPlanInfo.Actual_Execution_Quantity__c == SumNumMap.get(iPId + sumNumsList[5])
+ || actualQ == SumNumMap.get(iPId + sumNumsList[5])) {
IPlanInfo.Ben_Actual_Times__c = 1;//鏈鐐规娆℃暟锛堝鎵硅繃鍚庣殑鐐规鎶ュ憡涔︼級
if (IDateMap.get(iPId + 'End') == null) {
IPlanInfo.Execution_End_Date__c = IDateMap.get(iPId);//鐐规璁″垝 瀹屾垚鏃�
}
}
if (IDateMap.get(iPId + 'Start') == null) {
- System.debug('--------123------' + IDateMap.get(iPId + 'Start'));
IPlanInfo.Execution_Start_Date__c = IDateMap.get(iPId);//鎵ц寮�濮嬫棩--妫�娴嬫棩鏈�
}
IPlanInfo.Actual_Execute_Num__c = SumNumMap.get(iPId + sumNumsList[7]);
}
- System.debug('=====1===='+IPlanInfo.overstep_check_interval__c);
updateIPInfoList.add(IPlanInfo);
- System.debug('-------1------' + updateIPInfoList);
- }
+ // gzw 鐐规鍘嗗彶鏁版嵁涔熻鏇存柊鎵ц寮�濮嬫棩鍜屽畬鎴愭棩 start
+ // }
+ // gzw 鐐规鍘嗗彶鏁版嵁涔熻鏇存柊鎵ц寮�濮嬫棩鍜屽畬鎴愭棩 end
}
}
if (updateIPInfoList.size() > 0) {
--
Gitblit v1.9.1