From 75143725a73946b25c027486bb6839c9d0b6f2dd Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Fri, 8 Apr 2022 10:18:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.API/Controllers/InspectionController.cs | 6 ++++-- IRaCIS.Core.Application/IRaCIS.Core.Application.xml | 2 +- .../Service/Common/FrontAuditConfigService.cs | 3 ++- IRaCIS.Core.Domain/Common/FrontAuditConfig.cs | 2 -- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/IRaCIS.Core.API/Controllers/InspectionController.cs b/IRaCIS.Core.API/Controllers/InspectionController.cs index b0447d89a..c55bf4ed9 100644 --- a/IRaCIS.Core.API/Controllers/InspectionController.cs +++ b/IRaCIS.Core.API/Controllers/InspectionController.cs @@ -86,8 +86,10 @@ namespace IRaCIS.Core.API.Controllers { return ResponseOutput.NotOk(fun.ErrorMessage); } - opt.AuditInfo.SubjectId = Guid.Parse(fun.Data); - + opt.AuditInfo.SubjectVisitId = Guid.Parse(fun.Data); + opt.AuditInfo.SubjectVisitName = opt.OptCommand.VisitName; + + return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, null, fun); } diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index f5861d832..22e9715f1 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -1526,7 +1526,7 @@ - 需要签署数量 + 需要签署文件数量 系统级别的在第一行 diff --git a/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs b/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs index 0d614685b..c681246a2 100644 --- a/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs +++ b/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs @@ -92,6 +92,8 @@ namespace IRaCIS.Core.Application.Service } + + /// /// 获取列表 /// @@ -101,7 +103,6 @@ namespace IRaCIS.Core.Application.Service public async Task> GetFrontAuditConfigList(FrontAuditConfigQuery iq) { - var query = from data in _repository.GetQueryable() join childrenType in _repository.GetQueryable() on data.ChildrenTypeId equals childrenType.Id.ToString() into childrenTypetemp from leftchildrenType in childrenTypetemp.DefaultIfEmpty() diff --git a/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs b/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs index b7bae9b92..e4a3eb8e0 100644 --- a/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs +++ b/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs @@ -137,8 +137,6 @@ namespace IRaCIS.Core.Domain.Models /// public bool? IsHaveReason { get; set; } - - } }