From 8fd6ae9efb9020472b7a0fc5c89281ded4dbc46c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= Date: Fri, 28 Mar 2025 16:10:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96groupby=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E4=B8=8E=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DOAN.Service/MES/SmartScreen/Order/OrderSmartService.cs | 2 +- DOAN.Service/MES/SmartScreen/Quality/QualitySmartService.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DOAN.Service/MES/SmartScreen/Order/OrderSmartService.cs b/DOAN.Service/MES/SmartScreen/Order/OrderSmartService.cs index a15b337..7671f26 100644 --- a/DOAN.Service/MES/SmartScreen/Order/OrderSmartService.cs +++ b/DOAN.Service/MES/SmartScreen/Order/OrderSmartService.cs @@ -52,7 +52,7 @@ namespace DOAN.Service.MES.SmartScreen.Order List orderProgressDtos = new List(); // TODO 获取全部的订单计划表 （条件记得放回去） - List orderPurchaseList = Queryable().ToList(); + List orderPurchaseList = Queryable().Where(o=>o.Orderindicator != 1).ToList(); List ordernomes = new List(); ordernomes=orderPurchaseList.Select(o=>o.OrderNoMes).Distinct().ToList(); diff --git a/DOAN.Service/MES/SmartScreen/Quality/QualitySmartService.cs b/DOAN.Service/MES/SmartScreen/Quality/QualitySmartService.cs index 9dcc868..6509daa 100644 --- a/DOAN.Service/MES/SmartScreen/Quality/QualitySmartService.cs +++ b/DOAN.Service/MES/SmartScreen/Quality/QualitySmartService.cs @@ -109,12 +109,12 @@ namespace DOAN.Service.MES.SmartScreen.Quality // 使用 SqlSugar 进行联表查询和分组统计 var result = Context.Queryable() .Where(defect => defect.CheckDatetime >= startOfWeek && defect.CheckDatetime <= endOfWeek) - .GroupBy(defect => new { defect.DefectCode }) + .GroupBy(defect => new { defect.DefectCode, defect.DefectName }) .OrderBy(defect => new { defect.DefectCode }) .Select(defect => new EchartsSeriesData { - Name = defect.DefectName, + Name = SqlFunc.AggregateMax(defect.DefectName), Value = Convert.ToDecimal(SqlFunc.AggregateSum(defect.Number)) }) .ToList(); @@ -142,7 +142,7 @@ namespace DOAN.Service.MES.SmartScreen.Quality .Select(defect => new EchartsSeriesData { - Name = defect.DefectName, + Name = SqlFunc.AggregateMax(defect.DefectName), Value = Convert.ToDecimal(SqlFunc.AggregateSum(defect.Number)) }) .ToList();