From af71630882e31b153994e75b7118bcc43da4fe28 Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Wed, 19 Feb 2025 10:45:10 +0800 Subject: [PATCH] 1 --- DOAN.Service/MES/Group/AchievementService.cs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/DOAN.Service/MES/Group/AchievementService.cs b/DOAN.Service/MES/Group/AchievementService.cs index 378debd..46a1696 100644 --- a/DOAN.Service/MES/Group/AchievementService.cs +++ b/DOAN.Service/MES/Group/AchievementService.cs @@ -25,21 +25,18 @@ namespace DOAN.Service.MES.Group public List GetstaffAchievementList(AchievementQueryDto parm) { var predicate = QueryExp(parm); - return Context.Queryable().Where(predicate.ToExpression()) + var result= Context.Queryable().Where(predicate.ToExpression()) .GroupBy(x => x.Worker) .Select(it=>new AchievementDto { Worker = it.Worker, MaterialUse=SqlFunc.Subqueryable().Where(x=>x.Worker==it.Worker&&x.ProcessId==10).Where(predicate.ToExpression()).Sum(x=>x.FinishNum??0), - - + MechanicalProcessing = SqlFunc.Subqueryable().Where(x => x.Worker == it.Worker && x.ProcessId == 20).Where(predicate.ToExpression()).Sum(x => x.FinishNum ?? 0), - MiddleCheck = SqlFunc.Subqueryable().Where(x => x.Worker == it.Worker && x.ProcessId == 10).Where(predicate.ToExpression()).Sum(x => x.FinishNum ?? 0), - Handgrind = SqlFunc.Subqueryable().Where(x => x.Worker == it.Worker && x.ProcessId == 10).Where(predicate.ToExpression()).Sum(x => x.FinishNum ?? 0), Machinegrind = SqlFunc.Subqueryable().Where(x => x.Worker == it.Worker && x.ProcessId == 10).Where(predicate.ToExpression()).Sum(x => x.FinishNum ?? 0), @@ -54,6 +51,13 @@ namespace DOAN.Service.MES.Group Shipment = SqlFunc.Subqueryable().Where(x => x.Worker == it.Worker && x.ProcessId == 10).Where(predicate.ToExpression()).Sum(x => x.FinishNum ?? 0), }).Distinct().ToList(); + int index = 0; + foreach (var item in result) + { + index++; + item.Id = index; + } + return result; } private static Expressionable QueryExp(AchievementQueryDto parm)