This commit is contained in:
qianhao.xu
2025-02-19 10:45:10 +08:00
parent f6d4987056
commit af71630882

View File

@@ -25,21 +25,18 @@ namespace DOAN.Service.MES.Group
public List<AchievementDto> GetstaffAchievementList(AchievementQueryDto parm)
{
var predicate = QueryExp(parm);
return Context.Queryable<ProReportwork01>().Where(predicate.ToExpression())
var result= Context.Queryable<ProReportwork01>().Where(predicate.ToExpression())
.GroupBy(x => x.Worker)
.Select(it=>new AchievementDto
{
Worker = it.Worker,
MaterialUse=SqlFunc.Subqueryable<ProReportwork01>().Where(x=>x.Worker==it.Worker&&x.ProcessId==10).Where(predicate.ToExpression()).Sum(x=>x.FinishNum??0),
MechanicalProcessing = SqlFunc.Subqueryable<ProReportwork01>().Where(x => x.Worker == it.Worker && x.ProcessId == 20).Where(predicate.ToExpression()).Sum(x => x.FinishNum ?? 0),
MiddleCheck = SqlFunc.Subqueryable<ProReportwork01>().Where(x => x.Worker == it.Worker && x.ProcessId == 10).Where(predicate.ToExpression()).Sum(x => x.FinishNum ?? 0),
Handgrind = SqlFunc.Subqueryable<ProReportwork01>().Where(x => x.Worker == it.Worker && x.ProcessId == 10).Where(predicate.ToExpression()).Sum(x => x.FinishNum ?? 0),
Machinegrind = SqlFunc.Subqueryable<ProReportwork01>().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<ProReportwork01>().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<ProReportwork01> QueryExp(AchievementQueryDto parm)