From 36d58b74ccf346c2ee7420443f136a493991cf77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=A2=E6=B1=9F=E6=B5=B7?= <18360817963@163.com> Date: Thu, 27 Mar 2025 17:04:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E5=A4=A7=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Quality/QualitySmartService.cs | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/DOAN.Service/MES/SmartScreen/Quality/QualitySmartService.cs b/DOAN.Service/MES/SmartScreen/Quality/QualitySmartService.cs index ad171b5..33dec93 100644 --- a/DOAN.Service/MES/SmartScreen/Quality/QualitySmartService.cs +++ b/DOAN.Service/MES/SmartScreen/Quality/QualitySmartService.cs @@ -63,20 +63,16 @@ namespace DOAN.Service.MES.SmartScreen.Quality // 使用 SqlSugar 进行联表查询和分组统计 var result = Context.Queryable() - .LeftJoin((defect, work) => defect.Workorder == work.Workorder) - .Where((defect, work) => defect.CheckDatetime >= startOfWeek && defect.CheckDatetime <= endOfWeek) - .GroupBy((defect, work) => new { work.StoveCode, defect.DefectName }) - .Select((defect, work) => new EchartsSeriesData + .Where(defect => defect.CheckDatetime >= startOfWeek && defect.CheckDatetime <= endOfWeek) + .GroupBy(defect => new { defect.DefectCode }) + .Select(defect => new EchartsSeriesData { - + Name = defect.DefectName, - Value =Convert.ToDecimal(defect.Number) + Value = Convert.ToDecimal(SqlFunc.AggregateSum(defect.Number)) }) .ToList(); - - - return result; } @@ -94,13 +90,13 @@ namespace DOAN.Service.MES.SmartScreen.Quality // 使用 SqlSugar 进行联表查询和分组统计 var result = Context.Queryable() - .LeftJoin((defect, work) => defect.Workorder == work.Workorder) - .Where((defect, work) => defect.CheckDatetime >= firstDayOfMonth && defect.CheckDatetime <= lastDayOfMonth) - .GroupBy((defect, work) => new { work.StoveCode, defect.DefectName }) - .Select((defect, work) => new EchartsSeriesData + .Where(defect => defect.CheckDatetime >= firstDayOfMonth && defect.CheckDatetime <= lastDayOfMonth) + .GroupBy(defect => new { defect.DefectCode }) + .Select(defect => new EchartsSeriesData { + Name = defect.DefectName, - Value = Convert.ToDecimal(defect.Number) + Value =Convert.ToDecimal(SqlFunc.AggregateSum(defect.Number)) }) .ToList();