From 0212f86b928b3249f6da8ed27ec31e7c348b29d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Mon, 13 May 2024 08:35:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E6=A3=80=E5=AF=BC=E5=87=BA=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Service/mes/qc/QCStatisticsService.cs | 51 ++++++++++++++++++++++--
 1 file changed, 48 insertions(+), 3 deletions(-)

diff --git a/ZR.Service/mes/qc/QCStatisticsService.cs b/ZR.Service/mes/qc/QCStatisticsService.cs
index 9b2f4ed1..93584228 100644
--- a/ZR.Service/mes/qc/QCStatisticsService.cs
+++ b/ZR.Service/mes/qc/QCStatisticsService.cs
@@ -246,20 +246,65 @@ namespace ZR.Service.mes.qc
         public List<QcQualityStatisticsFirstDto> DoSecondExcel(DateTime starttime, DateTime endTime, string workorderid, string partnumber, string product_description, string team, int pageNum, int pageSize)
         {
             List<QcQualityStatisticsAgain> list = GetQualityStatisticsTable_again(starttime, endTime, workorderid, partnumber, product_description, team, pageNum, pageSize).Item1;
-            List<QcQualityStatisticsFirstDto> newList = list.Select(item => new QcQualityStatisticsFirstDto()).ToList();
+            List<QcQualityStatisticsFirstDto> newList = list.Select(item => new QcQualityStatisticsFirstDto()
+            {
+                WorkorderId = item.WorkorderId,
+                FinishedPartNumber = item.FinishedPartNumber,
+                ProductDescription = product_description,
+                Color = item.Color,
+                RequireNumber = item.RequireNumber,
+                Team = item.Team,
+                QualifiedNumber = item.QualifiedNumber,
+                QualifiedRate = item.QualifiedRate ?? 0,
+                PaoguangTotal = item.PaoguangTotal ?? 0,
+                DamoTotal = item.DamoTotal ?? 0,
+                BaofeiTotal = item.BaofeiTotal ?? 0,
+                StartTime = item.StartTime,
+                EndTime = item.EndTime,
+            }).ToList();
             return newList;
         }
 
         public List<QcQualityStatisticsFirstDto> DoThirdExcel(DateTime starttime, DateTime endTime, string workorderid, string partnumber, string product_description, string team, int pageNum, int pageSize)
         {
             List<QcQualityStatisticsFinal> list = GetQualityStatisticsTable_final(starttime, endTime, workorderid, partnumber, product_description, team, pageNum, pageSize).Item1;
-            List<QcQualityStatisticsFirstDto> newList = list.Select(item => new QcQualityStatisticsFirstDto()).ToList();
+            List<QcQualityStatisticsFirstDto> newList = list.Select(item => new QcQualityStatisticsFirstDto()
+            {
+                WorkorderId = item.WorkorderId,
+                FinishedPartNumber = item.FinishedPartNumber,
+                ProductDescription = product_description,
+                Color = item.Color,
+                RequireNumber = item.RequireNumber,
+                Team = item.Team,
+                QualifiedNumber = item.QualifiedNumber,
+                QualifiedRate = item.QualifiedRate ?? 0,
+                PaoguangTotal = item.PaoguangTotal ?? 0,
+                DamoTotal = item.DamoTotal ?? 0,
+                BaofeiTotal = item.BaofeiTotal ?? 0,
+                StartTime = item.StartTime,
+                EndTime = item.EndTime,
+            }).ToList();
             return newList;
         }
         public List<QcQualityStatisticsFirstDto> DoTotalExcel(DateTime starttime, DateTime endTime, string workorderid, string partnumber, string product_description, string team, int pageNum, int pageSize)
         {
             List<QcQualityStatisticsTotal> list  = GetQualityStatisticsTable_total(starttime, endTime, workorderid, partnumber, product_description, team, pageNum, pageSize).Item1;
-            List<QcQualityStatisticsFirstDto> newList = list.Select(item => new QcQualityStatisticsFirstDto()).ToList();
+            List<QcQualityStatisticsFirstDto> newList = list.Select(item => new QcQualityStatisticsFirstDto()
+            {
+                WorkorderId = item.WorkorderId,
+                FinishedPartNumber = item.FinishedPartNumber,
+                ProductDescription = product_description,
+                Color = item.Color,
+                RequireNumber = item.RequireNumber,
+                Team = item.Team,
+                QualifiedNumber = item.QualifiedNumber,
+                QualifiedRate = item.QualifiedRate ?? 0,
+                PaoguangTotal = item.PaoguangTotal ?? 0,
+                DamoTotal = item.DamoTotal ?? 0,
+                BaofeiTotal = item.BaofeiTotal ?? 0,
+                StartTime = item.StartTime,
+                EndTime = item.EndTime,
+            }).ToList();
             return newList;
         }
     }