From ffd6d0e6894ff7db718c7cfe1d8aae7450526743 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=91=E9=BE=99=20=E7=8E=8B?= Date: Thu, 5 Dec 2024 11:37:43 +0800 Subject: [PATCH] =?UTF-8?q?update:=20=E3=80=90=E5=88=86=E9=A1=B5=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E8=BD=A8=E8=BF=B9=E6=A8=A1=E6=9D=BF=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E3=80=91=E5=A2=9E=E5=8A=A0=E6=A8=A1=E7=B3=8A=E5=85=B3=E9=94=AE?= =?UTF-8?q?=E5=AD=97=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProvideServices/GetPageTrackTemplateListInput.cs | 5 +++++ .../TrackTemplate/GetPageTrackTemplateListInputVo.cs | 9 +++++++-- .../Repositories/TrackTemplateRepository.cs | 5 +++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackTemplateListInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackTemplateListInput.cs index d193eb8e..a591adf7 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackTemplateListInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackTemplateListInput.cs @@ -21,4 +21,9 @@ public class GetPageTrackTemplateListInput : PageInfoInput /// 模板code /// public string? TemplateCode { get; set; } + + /// + /// 关键字 + /// + public string? KeyWord { get; set; } } diff --git a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetPageTrackTemplateListInputVo.cs b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetPageTrackTemplateListInputVo.cs index b6e253a0..f801ffdc 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetPageTrackTemplateListInputVo.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetPageTrackTemplateListInputVo.cs @@ -1,8 +1,8 @@ namespace SJZY.Track.Domain.Dtos.TrackTemplate; -public class GetPageTrackTemplateListInputVo :PageInfoInput +public class GetPageTrackTemplateListInputVo : PageInfoInput { - /// + /// /// 子系统id /// public int SubSystemId { get; set; } @@ -21,4 +21,9 @@ public class GetPageTrackTemplateListInputVo :PageInfoInput /// 模板code /// public string? TemplateCode { get; set; } + + /// + /// 关键字 + /// + public string? KeyWord { get; set; } } diff --git a/src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs index c7f7c2c4..d399bcd1 100644 --- a/src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs @@ -250,6 +250,11 @@ public class TrackTemplateRepository : BasicRepository, ITr .LeftJoin((a, b, c) => b.TrackStatusId == c.Id) .LeftJoin((a, b, c, d) => c.Node == d.Id) .Where(a => templateIds.Contains(a.TrackTemplateId)) + .WhereIF(!input.KeyWord.IsNullOrWhiteSpace(), (a, b, c, d) => + b.Code.Contains(input.KeyWord!) + || b.EnContent.Contains(input.KeyWord!) + || b.Content.Contains(input.KeyWord!) + ) .Select((a, b, c, d) => new TemplateContentDtoVo { TemplateId = a.TrackTemplateId,