From 3e3497bed302c63a8998bd9fce585818394d09c8 Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Fri, 27 Dec 2024 13:08:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BC=BA=E9=99=B7=E9=A1=B9?=
 =?UTF-8?q?=20=E4=B8=8D=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MES/Quality/FQC/QcDefectConfigController.cs  | 10 ++++++++++
 .../MES/Quality/IQC/Dto/QcDefectConfigDto.cs     |  2 +-
 .../FQC/IService/IQcDefectConfigService.cs       |  3 +++
 .../MES/Quality/FQC/QcDefectConfigService.cs     | 16 ++++++++++++++++
 4 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/DOAN.Admin.WebApi/Controllers/MES/Quality/FQC/QcDefectConfigController.cs b/DOAN.Admin.WebApi/Controllers/MES/Quality/FQC/QcDefectConfigController.cs
index 88209cc..49b994c 100644
--- a/DOAN.Admin.WebApi/Controllers/MES/Quality/FQC/QcDefectConfigController.cs
+++ b/DOAN.Admin.WebApi/Controllers/MES/Quality/FQC/QcDefectConfigController.cs
@@ -37,6 +37,16 @@ namespace DOAN.WebApi.Controllers.MES.quality.FQC
             return SUCCESS(response);
         }
 
+        //TODO  查询缺陷项 不分页
+        [HttpGet("list_no_page")]
+        [AllowAnonymous]
+        public IActionResult QueryQcDefectConfigNoPage([FromQuery] QcDefectConfigQueryDto parm)
+        {
+            var response = _QcDefectConfigService.GetListNoPage(parm);
+            return SUCCESS(response);
+        }
+
+
 
         /// <summary>
         /// 查询缺陷类别详情
diff --git a/DOAN.Model/MES/Quality/IQC/Dto/QcDefectConfigDto.cs b/DOAN.Model/MES/Quality/IQC/Dto/QcDefectConfigDto.cs
index f283e6d..016b551 100644
--- a/DOAN.Model/MES/Quality/IQC/Dto/QcDefectConfigDto.cs
+++ b/DOAN.Model/MES/Quality/IQC/Dto/QcDefectConfigDto.cs
@@ -5,7 +5,7 @@ namespace DOAN.Model.MES.quality.IQC.Dto
     /// <summary>
     /// 缺陷类别查询对象
     /// </summary>
-    public class QcDefectConfigQueryDto : PagerInfo
+    public class QcDefectConfigQueryDto :PagerInfo
     {
         public string Name { get; set; }
         public string Code { get; set; }
diff --git a/DOAN.Service/MES/Quality/FQC/IService/IQcDefectConfigService.cs b/DOAN.Service/MES/Quality/FQC/IService/IQcDefectConfigService.cs
index 2200366..8662044 100644
--- a/DOAN.Service/MES/Quality/FQC/IService/IQcDefectConfigService.cs
+++ b/DOAN.Service/MES/Quality/FQC/IService/IQcDefectConfigService.cs
@@ -11,6 +11,9 @@ namespace DOAN.Service.MES.quality.FQC.IService
     {
         PagedInfo<QcDefectConfigDto> GetList(QcDefectConfigQueryDto parm);
 
+        List<QcDefectConfigDto> GetListNoPage(QcDefectConfigQueryDto parm);
+        
+
         QcDefectConfig GetInfo(int Id);
 
         QcDefectConfig AddQcDefectConfig(QcDefectConfig parm);
diff --git a/DOAN.Service/MES/Quality/FQC/QcDefectConfigService.cs b/DOAN.Service/MES/Quality/FQC/QcDefectConfigService.cs
index c76fa19..5b7867a 100644
--- a/DOAN.Service/MES/Quality/FQC/QcDefectConfigService.cs
+++ b/DOAN.Service/MES/Quality/FQC/QcDefectConfigService.cs
@@ -4,6 +4,7 @@ using DOAN.Model.MES.quality.IQC.Dto;
 using DOAN.Repository;
 using DOAN.Service.MES.quality.FQC.IService;
 using Infrastructure.Attribute;
+using Mapster;
 
 namespace DOAN.Service.MES.quality.FQC
 {
@@ -35,7 +36,22 @@ namespace DOAN.Service.MES.quality.FQC
             return response;
         }
 
+        public  List<QcDefectConfigDto> GetListNoPage(QcDefectConfigQueryDto parm)
+        {
+            var predicate = Expressionable.Create<QcDefectConfig>()
+                            .AndIF(!string.IsNullOrEmpty(parm.Name), it => it.Name.Contains(parm.Name))
+                            .AndIF(!string.IsNullOrEmpty(parm.Code), it => it.Code.Contains(parm.Code))
+                            .AndIF(!string.IsNullOrEmpty(parm.Group), it => it.Group.Contains(parm.Group))
+                            .AndIF(!string.IsNullOrEmpty(parm.QcType), it => it.QcType.Contains(parm.QcType))
+                            .AndIF(!string.IsNullOrEmpty(parm.Status), it => it.Status == parm.Status);
 
+
+            var response = Queryable()
+                .Where(predicate.ToExpression()).ToList().Adapt<List<QcDefectConfig>, List<QcDefectConfigDto>>();
+
+            return response;
+
+        }
         /// <summary>
         /// 获取详情
         /// </summary>