From 2702901ce4e6497d7d90568a262909af2ff1f966 Mon Sep 17 00:00:00 2001
From: chenlin <lin.chen@ruizhiao.cn>
Date: Mon, 26 Jan 2026 11:04:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E7=94=9F=E4=BA=A7=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DOAN.Model/MES/report/Dto/ReportDto.cs        |  2 +-
 .../IProPlanAchievementrateVersion2Service.cs |  2 +-
 .../ProPlanAchievementrateVersion2Service.cs  | 21 ++++++++++++++++---
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/DOAN.Model/MES/report/Dto/ReportDto.cs b/DOAN.Model/MES/report/Dto/ReportDto.cs
index d803baf..643dcfd 100644
--- a/DOAN.Model/MES/report/Dto/ReportDto.cs
+++ b/DOAN.Model/MES/report/Dto/ReportDto.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace DOAN.Model.MES
 {
-    public class MonthProductDto //: PagerInfo
+    public class MonthProductDto : PagerInfo
     {
         public DateTime SearchYearMonth { get; set; }
     }
diff --git a/DOAN.Service/MES/product/IService/IProPlanAchievementrateVersion2Service.cs b/DOAN.Service/MES/product/IService/IProPlanAchievementrateVersion2Service.cs
index 78c099f..2431d83 100644
--- a/DOAN.Service/MES/product/IService/IProPlanAchievementrateVersion2Service.cs
+++ b/DOAN.Service/MES/product/IService/IProPlanAchievementrateVersion2Service.cs
@@ -47,7 +47,7 @@ namespace DOAN.Service.MES.product.IService
 
         byte[] ExportData(DateTime exportDate);
 
-        List<MonthProuctModel> GetQueryMonthProduct(MonthProductDto parm);
+        PagedInfo<MonthProuctModel> GetQueryMonthProduct(MonthProductDto parm);
 
         (byte[] fileBytes, string fileName) ExportMonthProduct(MonthProductDto parm);
     }
diff --git a/DOAN.Service/MES/product/ProPlanAchievementrateVersion2Service.cs b/DOAN.Service/MES/product/ProPlanAchievementrateVersion2Service.cs
index 6fa0a30..cbe8726 100644
--- a/DOAN.Service/MES/product/ProPlanAchievementrateVersion2Service.cs
+++ b/DOAN.Service/MES/product/ProPlanAchievementrateVersion2Service.cs
@@ -573,7 +573,7 @@ namespace DOAN.Service.MES.product
         /// </summary>
         /// <param name="parm"></param>
         /// <returns></returns>
-        public List<MonthProuctModel> GetQueryMonthProduct(MonthProductDto parm)
+        public PagedInfo<MonthProuctModel> GetQueryMonthProduct(MonthProductDto parm)
         {
             (DateTime FirstDay, DateTime LastDay) Handlemonth = GetFirstAndLastDayOfMonth(parm.SearchYearMonth);
             var predicate = Expressionable.Create<ProPlanAchievementrateVersion2>()
@@ -611,7 +611,21 @@ namespace DOAN.Service.MES.product
                 t.SummaryPlanNum = t.DayProuctModels.Sum(it => it.SummaryPlanNum ?? 0);
                 t.SummaryPlanAchievementRate = Math.Round(t.SummaryActualNum * 100.0M / t.SummaryPlanNum ?? 1, 2);
             });
-            return monthProuctModelList;
+
+
+            PagedInfo<MonthProuctModel> result = new PagedInfo<MonthProuctModel>();
+            
+            result.TotalNum = monthProuctModelList.Count();
+            result.PageSize = parm.PageSize;
+            result.PageIndex = parm.PageNum;
+
+            var pagedResult = monthProuctModelList
+                                .Skip((parm.PageNum - 1) * parm.PageSize)
+                                .Take(parm.PageSize)
+                                .ToList();
+            result.Result = pagedResult;
+
+            return result;
         }
 
         public (byte[] fileBytes, string fileName) ExportMonthProduct(MonthProductDto parm)
@@ -621,7 +635,8 @@ namespace DOAN.Service.MES.product
             {
                 throw new CustomException("Excel 模板文件不存在");
             }
-            List<MonthProuctModel> list = GetQueryMonthProduct(parm);
+            parm.PageNum = 10000;
+            List<MonthProuctModel> list = GetQueryMonthProduct(parm).Result;
             if(list.Count==0)
             {
                 throw new CustomException("没有数据可以导出");