查询条件修改
parent
411b5d5f8f
commit
43d6c7d8db
|
@ -1558,6 +1558,13 @@
|
|||
<param name="inDto"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:IRaCIS.Core.Application.Service.TrialNormalRecordService.DeleteTrialNormalRecordList(IRaCIS.Core.Application.ViewModel.DeleteTrialNormalRecordListInDto)">
|
||||
<summary>
|
||||
批量删除一般文件记录
|
||||
</summary>
|
||||
<param name="inDto"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="T:IRaCIS.Core.Application.Service.TrialTrianingRecordService">
|
||||
<summary>
|
||||
项目-培训记录
|
||||
|
@ -1567,7 +1574,7 @@
|
|||
<param name="_userInfo"></param>
|
||||
<param name="_localizer"></param>
|
||||
</member>
|
||||
<member name="M:IRaCIS.Core.Application.Service.TrialTrianingRecordService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialTrianingRecord},AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
|
||||
<member name="M:IRaCIS.Core.Application.Service.TrialTrianingRecordService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialTrianingRecord},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialFile},AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
|
||||
<summary>
|
||||
项目-培训记录
|
||||
</summary>
|
||||
|
@ -1576,6 +1583,34 @@
|
|||
<param name="_userInfo"></param>
|
||||
<param name="_localizer"></param>
|
||||
</member>
|
||||
<member name="M:IRaCIS.Core.Application.Service.TrialTrianingRecordService.GetTrialTrianingRecordList(IRaCIS.Core.Application.ViewModel.TrialTrianingRecordQuery)">
|
||||
<summary>
|
||||
获取培训记录列表
|
||||
</summary>
|
||||
<param name="inDto"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:IRaCIS.Core.Application.Service.TrialTrianingRecordService.BatchAddTrialTrianingRecord(IRaCIS.Core.Application.ViewModel.BatchAddTTrianingRecordInDto)">
|
||||
<summary>
|
||||
批量新增培训记录
|
||||
</summary>
|
||||
<param name="inDto"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:IRaCIS.Core.Application.Service.TrialTrianingRecordService.AuthorizedTrialTrianingRecord(IRaCIS.Core.Application.ViewModel.AuthorizedTrialFinalRecordInDto)">
|
||||
<summary>
|
||||
授权文档
|
||||
</summary>
|
||||
<param name="inDto"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:IRaCIS.Core.Application.Service.TrialTrianingRecordService.DeleteTrialTrianingRecordList(IRaCIS.Core.Application.ViewModel.DeleteTrialNormalRecordListInDto)">
|
||||
<summary>
|
||||
批量删除培训记录
|
||||
</summary>
|
||||
<param name="inDto"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:IRaCIS.Core.Application.Service.CalculateService.GetFinalConfirmedWorkloadAndPayPriceList(IRaCIS.Application.Contracts.CalculateDoctorAndMonthDTO)">
|
||||
<summary>
|
||||
获取某个月下的某些医生最终确认的工作量,用于计算月度费用
|
||||
|
|
|
@ -61,8 +61,14 @@ public class TrialTrianingRecordQuery : PageInput
|
|||
|
||||
public int? TrianingCount { get; set; }
|
||||
|
||||
public DateOnly? TrianingDate { get; set; }
|
||||
|
||||
public DateOnly? TrianingDateStartTime { get; set; }
|
||||
|
||||
public DateOnly? TrianingDateEndTime { get; set; }
|
||||
|
||||
public DateTime? UpdateStartTime { get; set; }
|
||||
|
||||
public DateTime? UpdateEndTime { get; set; }
|
||||
|
||||
public int? TrianingState { get; set; }
|
||||
}
|
||||
|
||||
|
|
|
@ -39,7 +39,10 @@ public class TrialTrianingRecordService(IRepository<
|
|||
var trialTrianingRecordQueryable = _trialTrianingRecordRepository
|
||||
.Where(x => x.TrialFileTypeId == inDto.TrialFileTypeId)
|
||||
.WhereIf(inDto.FileName.IsNotNullOrEmpty(), x => x.TrialFileRecord.FileName.Contains(inDto.FileName))
|
||||
.WhereIf(inDto.TrianingDate!=null, x => x.TrianingDate==inDto.TrianingDate)
|
||||
.WhereIf(inDto.TrianingDateStartTime != null, x => x.TrianingDate >= inDto.TrianingDateStartTime)
|
||||
.WhereIf(inDto.TrianingDateEndTime != null, x => x.TrianingDate <= inDto.TrianingDateEndTime)
|
||||
.WhereIf(inDto.UpdateStartTime != null, x => x.UpdateTime >= inDto.UpdateStartTime)
|
||||
.WhereIf(inDto.UpdateEndTime != null, x => x.UpdateTime < inDto.UpdateEndTime.Value.AddDays(1))
|
||||
.ProjectTo<TrialTrianingRecordView>(_mapper.ConfigurationProvider);
|
||||
|
||||
var pageList = await trialTrianingRecordQueryable.ToPagedListAsync(inDto);
|
||||
|
|
Loading…
Reference in New Issue