sit期间修改

19626

2023-09-13 196df4d4bf1941546d349cadbf343655578ec280

 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

            // 【FY24大及巨大课题】北京新法规项目对应 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;
                }
            }
            // 【FY24大及巨大课题】北京新法规项目对应 DB202307428742 20230804 by lc End

            update tempTask;
            //成功返回更新成功
@@ -371,6 +386,9 @@
                       //2021-11-25  mzy  任务管理改善  start
                       'HopeCompletionDate__c,'+
                       //2021-11-25  mzy  任务管理改善  end
                       // 【FY24大及巨大课题】北京新法规项目对应 DB202307428742 20230804 by lc Start
                       'Estimated_Finish_Date__c,LatestFinishDate__c,'+
                       // 【FY24大及巨大课题】北京新法规项目对应 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; 
            

            //【FY24大及巨大课题】北京新法规项目对应 DB202307428742 20230804 by lc Start
            tempTaskWrapper.createdAfter3Month   = tempTask.CreateDate__c.addMonths(3);
            tempTaskWrapper.latestFinishDate   = tempTask.LatestFinishDate__c;
            //【FY24大及巨大课题】北京新法规项目对应 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
        //【FY24大及巨大课题】北京新法规项目对应 DB202307428742 20230804 by lc Start
        @AuraEnabled
        public Date  createdAfter3Month;
        @AuraEnabled
        public Date  latestFinishDate;
        //【FY24大及巨大课题】北京新法规项目对应 DB202307428742 20230804 by lc End
    }
    public class pickerWrapper {
        @AuraEnabled