From 07af15f9a676f6db7300fd6d9bc0ef661a685f4b Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 29 Jun 2022 16:34:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Allocation/VisitTaskService.cs | 4 +++- .../TT_Template/IRaCIS .Core.IServiceAsync.tt | 4 ++-- .../TT_Template/IRaCIS .Core.ServiceAsync.tt | 12 ++++++------ 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs index 743250e49..e44bb6c2b 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs @@ -1038,7 +1038,9 @@ namespace IRaCIS.Core.Application.Service { await _visitTaskRepository.UpdatePartialFromQueryAsync(t => t.Id == item.OriginalReReadingTaskId, u => new VisitTask() { - ReReadingApplyState = (agreeReReadingCommand.RequestReReadingResultEnum == RequestReReadingResult.Agree ? ReReadingApplyState.Agree : ReReadingApplyState.Reject) + ReReadingApplyState = (agreeReReadingCommand.RequestReReadingResultEnum == RequestReReadingResult.Agree ? ReReadingApplyState.Agree : ReReadingApplyState.Reject), + TaskState = (agreeReReadingCommand.RequestReReadingResultEnum == RequestReReadingResult.Agree ? TaskState.HaveReturned : TaskState.Effect) + }); await _visitTaskReReadingRepository.UpdatePartialFromQueryAsync(t => t.Id == item.Id, u => new VisitTaskReReading() diff --git a/IRaCIS.Core.Test/TT_Template/IRaCIS .Core.IServiceAsync.tt b/IRaCIS.Core.Test/TT_Template/IRaCIS .Core.IServiceAsync.tt index c93135935..9f0639f40 100644 --- a/IRaCIS.Core.Test/TT_Template/IRaCIS .Core.IServiceAsync.tt +++ b/IRaCIS.Core.Test/TT_Template/IRaCIS .Core.IServiceAsync.tt @@ -52,10 +52,10 @@ namespace IRaCIS.Core.Application.Interfaces { <# if(isPage){#> - TaskView>> Get<#=tableName#>List(<#=tableName#>Query query<#=tableName#>); + TaskView>> Get<#=tableName#>List(<#=tableName#>Query inQuery); <# } else {#> - TaskView>> Get<#=tableName#>List(<#=tableName#>Query query<#=tableName#>); + TaskView>> Get<#=tableName#>List(<#=tableName#>Query inQuery); <# }#> Task AddOrUpdate<#=tableName#>(<#=tableName#>AddOrEdit addOrEdit<#=tableName#>); diff --git a/IRaCIS.Core.Test/TT_Template/IRaCIS .Core.ServiceAsync.tt b/IRaCIS.Core.Test/TT_Template/IRaCIS .Core.ServiceAsync.tt index ebbf257bb..6f4012cde 100644 --- a/IRaCIS.Core.Test/TT_Template/IRaCIS .Core.ServiceAsync.tt +++ b/IRaCIS.Core.Test/TT_Template/IRaCIS .Core.ServiceAsync.tt @@ -65,12 +65,12 @@ namespace IRaCIS.Core.Application.Service } <# if(isPage){#> - public async TaskView>> Get<#=tableName#>List(<#=tableName#>Query query<#=tableName#>) + public async TaskView>> Get<#=tableName#>List(<#=tableName#>Query inQuery) { var <#=char.ToLower(tableName[0]) + tableName.Substring(1)#>Queryable = - _repository.GetQueryable<<#=tableName#>>() + _<#=char.ToLower(tableName[0]) + tableName.Substring(1)#>Repository .ProjectTo<<#=tableName#>View>(_mapper.ConfigurationProvider); var pageList= await <#=char.ToLower(tableName[0]) + tableName.Substring(1)#>Queryable. @@ -81,11 +81,11 @@ namespace IRaCIS.Core.Application.Service } <# } else {#> - public async TaskView>> Get<#=tableName#>List(<#=tableName#>Query query<#=tableName#>) + public async TaskView>> Get<#=tableName#>List(<#=tableName#>Query inQuery) { - var <#=char.ToLower(tableName[0]) + tableName.Substring(1)#>Queryable = _repository.GetQueryable<<#=tableName#>>() + var <#=char.ToLower(tableName[0]) + tableName.Substring(1)#>Queryable = _<#=char.ToLower(tableName[0]) + tableName.Substring(1)#>Repository .ProjectTo<<#=tableName#>View>(_mapper.ConfigurationProvider); return await <#=char.ToLower(tableName[0]) + tableName.Substring(1)#>Queryable.ToListAsync(); @@ -102,7 +102,7 @@ namespace IRaCIS.Core.Application.Service // CreateMap< <#=tableName#>,<#=tableName#>AddOrEdit>().ReverseMap(); - var entity = await _repository.InsertOrUpdateAsync<<#=tableName#>, <#=tableName#>AddOrEdit>(addOrEdit<#=tableName#>, true); + var entity = await _<#=char.ToLower(tableName[0]) + tableName.Substring(1)#>Repository.InsertOrUpdateAsync(addOrEdit<#=tableName#>, true); return ResponseOutput.Ok(entity.Id.ToString()); @@ -112,7 +112,7 @@ namespace IRaCIS.Core.Application.Service [HttpDelete("{<#=char.ToLower(tableName[0]) + tableName.Substring(1)#>Id:guid}")] public async Task Delete<#=tableName#>(Guid <#=char.ToLower(tableName[0]) + tableName.Substring(1)#>Id) { - var success = await _repository.DeleteFromQueryAsync<<#=tableName#>>(t => t.Id == <#=char.ToLower(tableName[0]) + tableName.Substring(1)#>Id); + var success = await _<#=char.ToLower(tableName[0]) + tableName.Substring(1)#>Repository.DeleteFromQueryAsync(t => t.Id == <#=char.ToLower(tableName[0]) + tableName.Substring(1)#>Id,true); return ResponseOutput.Result(success); }