From 2903531dd163ffec916a3f3c787b264ddbafa9bd Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Sat, 14 Sep 2024 09:04:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=84=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DOAN.Model/MES/base/Dto/BaseGroupDto.cs   | 5 +++++
 DOAN.Service/MES/base/BaseGroupService.cs | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/DOAN.Model/MES/base/Dto/BaseGroupDto.cs b/DOAN.Model/MES/base/Dto/BaseGroupDto.cs
index 52a25e8..24c4b0a 100644
--- a/DOAN.Model/MES/base/Dto/BaseGroupDto.cs
+++ b/DOAN.Model/MES/base/Dto/BaseGroupDto.cs
@@ -7,6 +7,11 @@ namespace DOAN.Model.MES.base_.Dto
     /// </summary>
     public class BaseGroupQueryDto : PagerInfo 
     {
+        public string GroupCode { get; set; }
+
+        public string GroupName { get; set; }
+
+        public int? Status { get; set; }
     }
 
     /// <summary>
diff --git a/DOAN.Service/MES/base/BaseGroupService.cs b/DOAN.Service/MES/base/BaseGroupService.cs
index b1352cf..52d68f0 100644
--- a/DOAN.Service/MES/base/BaseGroupService.cs
+++ b/DOAN.Service/MES/base/BaseGroupService.cs
@@ -26,7 +26,10 @@ namespace DOAN.Service.MES.base_
         /// <returns></returns>
         public PagedInfo<BaseGroupDto> GetList(BaseGroupQueryDto parm)
         {
-            var predicate = Expressionable.Create<BaseGroup>();
+            var predicate = Expressionable.Create<BaseGroup>()
+                .AndIF(!string.IsNullOrEmpty(parm.GroupCode), it => it.GroupCode == parm.GroupCode)
+                .AndIF(!string.IsNullOrEmpty(parm.GroupName), it => it.GroupName == parm.GroupName)
+                .AndIF(parm.Status > 0, it => it.Status == parm.Status);
 
             var response = Queryable()
                 .Where(predicate.ToExpression())