From 196df4d4bf1941546d349cadbf343655578ec280 Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期三, 13 九月 2023 15:05:56 +0800
Subject: [PATCH] sit期间修改
---
force-app/main/default/classes/taskManageController.cls | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/classes/taskManageController.cls b/force-app/main/default/classes/taskManageController.cls
index 783fcab..dbfd2e1 100644
--- a/force-app/main/default/classes/taskManageController.cls
+++ b/force-app/main/default/classes/taskManageController.cls
@@ -37,7 +37,7 @@
}
// 纭鎴栬�呭欢鏈�
@AuraEnabled
- public static string confirmOrDelay(boolean isDelay, string delayReason, string delayReasonOther, string taskID,Boolean IsGeneratePlan,Date ActivityDate,Date feedbackPlanDate) {
+ public static string confirmOrDelay(boolean isDelay, string delayReason, string delayReasonOther, string taskID,Boolean IsGeneratePlan,Date ActivityDate,Date feedbackPlanDate,Date estimatedFinishDate) {
//2021-07-30 mzy SWAG-C5DAX8 update start
UserResult u = UserInfo_Owner();
//2021-07-30 mzy SWAG-C5DAX8 update end
@@ -64,6 +64,21 @@
tempTask.feedbackPlanDate__c = feedbackPlanDate;
}
//2021-10-20 mzy 浠诲姟绠＄悊鏀瑰杽 end
+
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc Start
+ Task__c tempObj = [SELECT Id, taskType__c FROM Task__c WHERE Id =: taskID];
+ if (tempObj.taskType__c == '鐩樼偣妫�鏌ヨ鍒�' || tempObj.taskType__c == '娓╂箍搴︽鏌ヨ鍒�') {
+ if (isDelay) {
+ tempTask.taskStatus__c = '05 寤舵湡';
+ tempTask.delayDate__c = Date.today();
+ tempTask.delayToDate__c = estimatedFinishDate;
+ } else {
+ tempTask.taskStatus__c = '02 鎺ュ彈';
+ tempTask.ConfirmDate__c = Date.today();
+ tempTask.Estimated_Finish_Date__c = estimatedFinishDate;
+ }
+ }
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc End
update tempTask;
//鎴愬姛杩斿洖鏇存柊鎴愬姛
@@ -371,6 +386,9 @@
//2021-11-25 mzy 浠诲姟绠＄悊鏀瑰杽 start
'HopeCompletionDate__c,'+
//2021-11-25 mzy 浠诲姟绠＄悊鏀瑰杽 end
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc Start
+ 'Estimated_Finish_Date__c,LatestFinishDate__c,'+
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc End
'taskStatus__c,taskType__c,Assignment_Date__c from task__c where assignee__c =: userIDList and mergeTaskMain__c = null ' +
//2021-1-4 yjk 澧炲姞浠诲姟鍖哄垎锛屽彧鏌ヨ琚姩鍜屼笂绾у垎閰�
//' and TaskDifferent__c != \'涓诲姩浠诲姟\' ';
@@ -476,7 +494,12 @@
tempTaskWrapper.assignButtonisDisabled = false;
//20210111 CHAN-BWX3YU you start
tempTaskWrapper.assignButtonisDisabled_Owner = false;
-
+
+ //銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc Start
+ tempTaskWrapper.createdAfter3Month = tempTask.CreateDate__c.addMonths(3);
+ tempTaskWrapper.latestFinishDate = tempTask.LatestFinishDate__c;
+ //銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc End
+
Date d2 = date.today().addDays(-2);
Date createdate1= date.newinstance(tempTask.CreateDate__c.year(), tempTask.CreateDate__c.month(), tempTask.CreateDate__c.day());
system.debug('鍒嗛厤鏃堕棿'+tempTask.Assignment_Date__c+'==d2=='+d2);
@@ -676,6 +699,12 @@
@AuraEnabled
public Date HopeCompletionDate;
//2021-11-25 浠诲姟绠＄悊鏀瑰杽 mzy
+ //銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc Start
+ @AuraEnabled
+ public Date createdAfter3Month;
+ @AuraEnabled
+ public Date latestFinishDate;
+ //銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc End
}
public class pickerWrapper {
@AuraEnabled
--
Gitblit v1.9.1