From d639afb8a0e7e4aed5b8c63e57a33ee0bda4bd77 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 30 Jun 2022 15:04:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Allocation/DTO/VisitTaskViewModel.cs | 7 ++----- .../Service/Allocation/VisitTaskService.cs | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs index be164e8bf..eaf2b1520 100644 --- a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs @@ -102,12 +102,13 @@ namespace IRaCIS.Core.Application.ViewModel //重阅原始编号 //public string ReReadingOriginalTaskCode { get; set; } + public Guid Id { get; set; } + public VisitTaskView OriginalReReadingTask { get; set; } public string? ReReadingNewTaskCode { get; set; } - public ReReadingApplyState ReReadingApplyState { get; set; } public ReadingTaskState ReadingTaskState { get; set; } @@ -529,10 +530,6 @@ namespace IRaCIS.Core.Application.ViewModel [NotDefault] public Guid OriginalReReadingTaskId { get; set; } - //重阅申请 产生的新任务Id - [NotDefault] - public Guid NewReReadingTaskId { get; set; } - } diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs index a4c1c7ce0..d75eb2e03 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs @@ -1012,13 +1012,13 @@ namespace IRaCIS.Core.Application.Service { RootReReadingTaskId = rootReReadingTaskId == Guid.Empty ? task.Id : rootReReadingTaskId, - + OriginalReReadingTaskId = task.Id, RequestReReadingTime = DateTime.Now, RequestReReadingUserId = _userInfo.Id, RequestReReadingReason = applyReReadingCommand.RequestReReadingReason, RequestReReadingType = applyReReadingCommand.RequestReReadingType, - }); + }); ; }