yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 支持搜索name,idno,no

Browse Source
This commit is contained in:
liguoyang
2024-11-22 10:27:27 +08:00
parent 3dd6e27128
commit a7ca9817b1
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Src/Dlhis.Basic/Appointment/Controllers/AppointmentsController.cs
View File

@@ -87,15 +87,16 @@ public class AppointmentsController : ControllerBase
/// 门禁预约 /// 门禁预约
/// </summary> /// </summary>
/// <param name="factory"></param> /// <param name="factory"></param>
/// <param name="search"></param>
/// <param name="status"></param> /// <param name="status"></param>
/// <param name="start"></param> /// <param name="start"></param>
/// <param name="end"></param> /// <param name="end"></param>
/// <returns></returns> /// <returns></returns>
[AllowAnonymous] [AllowAnonymous]
[HttpGet("door/list")] [HttpGet("door/list")]
public async Task<List<AppointmentDetailResponse>> GetRecordListAsync(string factory, VisitorAppointmentDetailStatusEnumType? status, DateTime start, DateTime end) public async Task<List<AppointmentDetailResponse>> GetRecordListAsync(string factory, string search, VisitorAppointmentDetailStatusEnumType? status, DateTime start, DateTime end)
{ {
return await _appointmentService.GetRecordListAsync(factory, status, start, end); return await _appointmentService.GetRecordListAsync(factory, search, status, start, end);
} }
/// <summary> /// <summary>

3
Src/Dlhis.Basic/Appointment/Services/IAppointmentService.cs
View File

@@ -42,11 +42,12 @@ public interface IAppointmentService : IScopeDependency
/// 获取记录列表 /// 获取记录列表
/// </summary> /// </summary>
/// <param name="factory"></param> /// <param name="factory"></param>
/// <param name="search"></param>
/// <param name="status"></param> /// <param name="status"></param>
/// <param name="start"></param> /// <param name="start"></param>
/// <param name="end"></param> /// <param name="end"></param>
/// <returns></returns> /// <returns></returns>
Task<List<AppointmentDetailResponse>> GetRecordListAsync(string factory, VisitorAppointmentDetailStatusEnumType? status, DateTime start, DateTime end); Task<List<AppointmentDetailResponse>> GetRecordListAsync(string factory, string search, VisitorAppointmentDetailStatusEnumType? status, DateTime start, DateTime end);
Task<Pagination<AppointmentDetailResponse>> GetRecordPageByIdNoAsync([FromQuery] AppointmentIdNoPageRequest request); Task<Pagination<AppointmentDetailResponse>> GetRecordPageByIdNoAsync([FromQuery] AppointmentIdNoPageRequest request);

3
Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs
View File

@@ -206,7 +206,7 @@ public class AppointmentService : IAppointmentService
} }
public async Task<List<AppointmentDetailResponse>> GetRecordListAsync(string factory, VisitorAppointmentDetailStatusEnumType? status, DateTime start, DateTime end) public async Task<List<AppointmentDetailResponse>> GetRecordListAsync(string factory, string search, VisitorAppointmentDetailStatusEnumType? status, DateTime start, DateTime end)
{ {
return await _dbContext.Queryable<VisitorAppointmentDetailEntity>() return await _dbContext.Queryable<VisitorAppointmentDetailEntity>()
.LeftJoin<GainfoEntity>((x, ga) => ga.IdNo == x.IdNo) .LeftJoin<GainfoEntity>((x, ga) => ga.IdNo == x.IdNo)
@@ -214,6 +214,7 @@ public class AppointmentService : IAppointmentService
.Where(x => x.IsEnterDoorArea) .Where(x => x.IsEnterDoorArea)
.WhereIF(status.HasValue, x => x.DoorStatus == status) .WhereIF(status.HasValue, x => x.DoorStatus == status)
.Where(x => x.DoorStart >= start && x.DoorEnd <= end) .Where(x => x.DoorStart >= start && x.DoorEnd <= end)
.WhereIF(search.IsPresent(), x => x.Name.Contains(search) || x.No == search || x.IdNo == search)
.Select(x => new AppointmentDetailResponse .Select(x => new AppointmentDetailResponse
{ {
No = x.No, No = x.No,