From 912bc2edb855734695a1ccba5bc1344dcdd8984a Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Sat, 7 Oct 2023 10:49:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9pi=20=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Allocation/DTO/VisitTaskViewModel.cs | 10 +++++++++- .../Service/Allocation/VisitTaskService.cs | 2 ++ .../Service/Allocation/_MapConfig.cs | 2 +- IRaCIS.Core.Domain/Allocation/PIAudit.cs | 2 ++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs index d94c9f5ad..7ec04337f 100644 --- a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs @@ -479,9 +479,17 @@ namespace IRaCIS.Core.Application.ViewModel } - public class PIAuditDialogListView : PIAuditTaskCommand + public class PIAuditDialogListView { + public Guid VisitTaskId { get; set; } + public string NotAgreeReason { get; set; } + public string PIAuditNote { get; set; } = string.Empty; + + public List PIAuditImagePathList { get; set; } + + public PIAuditState? PIAuditState { get; set; } + public string ReplyContent { get; set; } = string.Empty; public bool? IsEnrollment { get; set; } diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs index 0c11cc06d..7eb28540c 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs @@ -275,6 +275,8 @@ namespace IRaCIS.Core.Application.Service.Allocation //发送对话 var addDialig = _mapper.Map(incommand); + addDialig.PIAuditState = incommand.PIAuditState; + addDialig.PIAuditImagePath = visitTask.PIAuditImagePath; await _PIAuditRepository.AddAsync(addDialig); diff --git a/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs b/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs index dc05bd84b..fa4e39cf7 100644 --- a/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs @@ -251,7 +251,7 @@ namespace IRaCIS.Core.Application.Service CreateMap() .ForMember(o => o.CreateUserName, t => t.MapFrom(u => u.CreateUser.UserName)) .ForMember(o => o.UserTypeEnum, t => t.MapFrom(u => u.CreateUser.UserTypeEnum)) - .ForMember(o => o.PIAuditState, t => t.MapFrom(u => u.VisitTask.PIAuditState)) + //.ForMember(o => o.PIAuditState, t => t.MapFrom(u => u.VisitTask.PIAuditState)) ; diff --git a/IRaCIS.Core.Domain/Allocation/PIAudit.cs b/IRaCIS.Core.Domain/Allocation/PIAudit.cs index e4f83d6dd..f2afa8db4 100644 --- a/IRaCIS.Core.Domain/Allocation/PIAudit.cs +++ b/IRaCIS.Core.Domain/Allocation/PIAudit.cs @@ -35,6 +35,8 @@ namespace IRaCIS.Core.Domain.Models public string NotAgreeReason { get; set; } = string.Empty; + public PIAuditState? PIAuditState { get; set; } + public string PIAuditImagePath { get; set; } = string.Empty;