任务修改

2022-06-27 15:18:57 +08:00
parent b26e596ffb
commit 3d02f19e8f
4 changed files with 11 additions and 9 deletions
@@ -74,17 +74,13 @@ namespace IRaCIS.Core.Application.ViewModel

    public class ReadingTaskView : VisitTaskView
    {
-        public ReReadingApplyState ReReadingApplyState { get; set; }
+     
        public ReadingTaskState ReadingTaskState { get; set; }


        public DateTime? SignTime { get; set; }

-
-        public RequestReReadingResult RequestReReadingResultEnum { get; set; }
-
-        ////是否 重阅
-        //public bool IsReReading { get; set; }
+        public ReReadingApplyState ReReadingApplyState { get; set; }
        public DateTime? SuggesteFinishedTime { get; set; }

    }
@@ -127,6 +123,9 @@ namespace IRaCIS.Core.Application.ViewModel
    {
        public ReadingTaskState ReadingTaskState { get; set; }

+        public ReReadingApplyState ReReadingApplyState { get; set; }
+        public DateTime? SuggesteFinishedTime { get; set; }
+
        //签名时间
        public DateTime? SignTime { get; set; }
    }
@@ -899,7 +899,7 @@ namespace IRaCIS.Core.Application.Service
            {
                if (task.ReReadingApplyState == ReReadingApplyState.HaveApplyed || task.ReReadingApplyState == ReReadingApplyState.Agree)
                {
-                    throw new BusinessValidationFailedException("已申请，或者同意状态不允许再次申请重阅");
+                    throw new BusinessValidationFailedException("重阅已申请，或者重阅已同意状态下不允许申请重阅");
                }
                task.ReReadingApplyState = ReReadingApplyState.HaveApplyed;

@@ -920,7 +920,7 @@ namespace IRaCIS.Core.Application.Service
                }
            }

-            //产生的新任务，状态保持很申请的一直
+            //产生的新任务，状态保持跟申请的一直
            var reReadingTaskList = taskList.Clone();

            await _visitTaskCommonService.AddTaskAsync(new GenerateTaskCommand()