From b31862a2de1e2217fed594d7f700f5024edd475f Mon Sep 17 00:00:00 2001
From: qianjiawei <1184704771@qq.com>
Date: Thu, 16 Nov 2023 16:17:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=85=B7=E4=B8=8E=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E3=80=81=E8=AE=BE=E5=A4=87=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BasicData/Tnb.BasicData/BasMaterialService.cs | 15 +++++++++++----
 EquipMgr/Tnb.EquipMgr/EquipmentService.cs     | 13 +++++++++++--
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/BasicData/Tnb.BasicData/BasMaterialService.cs b/BasicData/Tnb.BasicData/BasMaterialService.cs
index 1b769e9d..6cb32234 100644
--- a/BasicData/Tnb.BasicData/BasMaterialService.cs
+++ b/BasicData/Tnb.BasicData/BasMaterialService.cs
@@ -1,3 +1,4 @@
+using Aop.Api.Domain;
 using JNPF.Common.Core.Manager;
 using JNPF.Common.Enums;
 using JNPF.Common.Filter;
@@ -167,15 +168,21 @@ namespace Tnb.BasicData
         public async Task<dynamic> GetMaterialByType(Dictionary<string, string> dic)
         {
             string types = dic["types"];
+            int currentPage = int.Parse(dic["currentPage"].ToString());
+            int pagesize = int.Parse(dic["pageSize"].ToString());
+            string queryJson = dic["queryJson"];
             string[] typeArr = types.Split(",");
             List<BasMaterial> list = await _repository.AsSugarClient().Queryable<BasMaterial>().Where(x => x.state == "1").ToListAsync();
-            List<BasMaterial> result = new();
+            List<string> ids = new();
             foreach (string type in typeArr)
             {
-                result.AddRange(list.Where(x => x.category_id.Contains(type)));
+                ids.AddRange(list.Where(x => x.category_id.Contains(type)).Select(p => p.id));
             }
-
-            return result;
+            SqlSugarPagedList<BasMaterial> result = await _repository.AsSugarClient().Queryable<BasMaterial>()
+            .WhereIF(ids.Count > 0, a => ids.Contains(a.id))
+           .WhereIF(!string.IsNullOrEmpty(queryJson), a => a.name.Contains(queryJson) || a.code.Contains(queryJson))
+           .Select(a => a).ToPagedListAsync(currentPage, pagesize);
+            return PageResult<BasMaterial>.SqlSugarPageResult(result);
         }
 
         [HttpPost]
diff --git a/EquipMgr/Tnb.EquipMgr/EquipmentService.cs b/EquipMgr/Tnb.EquipMgr/EquipmentService.cs
index 09ed9bf3..3630b578 100644
--- a/EquipMgr/Tnb.EquipMgr/EquipmentService.cs
+++ b/EquipMgr/Tnb.EquipMgr/EquipmentService.cs
@@ -1,5 +1,6 @@
 using JNPF.Common.Core.Manager;
 using JNPF.Common.Dtos.VisualDev;
+using JNPF.Common.Filter;
 using JNPF.DependencyInjection;
 using JNPF.DynamicApiController;
 using JNPF.Extras.CollectiveOAuth.Models;
@@ -10,6 +11,8 @@ using JNPF.VisualDev.Entitys;
 using JNPF.VisualDev.Entitys.Dto.VisualDevModelData;
 using JNPF.VisualDev.Interfaces;
 using Microsoft.AspNetCore.Mvc;
+using Org.BouncyCastle.Crypto;
+using Spire.Doc.Documents;
 using SqlSugar;
 using Tnb.BasicData;
 using Tnb.BasicData.Entities;
@@ -161,8 +164,14 @@ namespace Tnb.EquipMgr
         {
             string typeIds = dic["typeIds"];
             string[] typeIdArr = typeIds.Split(",");
-            return await _repository.AsSugarClient().Queryable<EqpEquipment>().Where(x => typeIdArr.Contains(x.equip_type_id))
-                .ToListAsync();
+            int currentPage = int.Parse(dic["currentPage"].ToString());
+            int pagesize = int.Parse(dic["pageSize"].ToString());
+            string queryJson = dic["queryJson"];
+            SqlSugarPagedList<EqpEquipment> result = await _repository.AsSugarClient().Queryable<EqpEquipment>()
+            .WhereIF(typeIdArr.Length > 0, a => typeIdArr.Contains(a.equip_type_id))
+            .WhereIF(!string.IsNullOrEmpty(queryJson), a => a.name.Contains(queryJson) || a.code.Contains(queryJson))
+            .Select(a => a).ToPagedListAsync(currentPage, pagesize);
+            return PageResult<EqpEquipment>.SqlSugarPageResult(result);
         }
 
         [HttpPost]