RIZO/BeizeValveBackend
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

获取员工绩效列表

Browse Source
This commit is contained in:
qianhao.xu 2025-02-19 08:49:05 +08:00
parent 54ee03de40
commit 49973781e2
3 changed files with 16 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DOAN.Admin.WebApi/Controllers/MES/Group/AchievementController.cs
View File

@ -9,7 +9,7 @@ namespace DOAN.Admin.WebApi.Controllers.MES.Group
/// 员工绩效
/// </summary>
[Verify]
[Route("mes/deviceManagement/DeviceAccount")]
[Route("mes/groupManagement/Achievement")]
public class AchievementController : BaseController
{
private readonly IAchievementService _achievementService;

42
DOAN.Model/MES/Group/Dto/AchievementDto.cs
View File

@ -23,77 +23,49 @@ namespace DOAN.Model.MES.Group.Dto
/// </summary>
public int MaterialUse { get; set; }
/// <summary>
/// 工作时间
/// </summary>
public DateTime? JobDatetime01 { get; set; }
/// <summary>
/// 机械加工
/// </summary>
public int MechanicalProcessing { get; set; }
/// <summary>
/// 工作时间
/// </summary>
public DateTime? JobDatetime02 { get; set; }
/// <summary>
/// 中间检查
/// </summary>
public int MiddleCheck { get; set; }
/// <summary>
/// 工作时间
/// </summary>
public DateTime? JobDatetime03 { get; set; }
/// <summary>
/// 手工研磨
/// </summary>
public int Handgrind { get; set; }
/// <summary>
/// 工作时间
/// </summary>
public DateTime? JobDatetime04 { get; set; }
/// <summary>
/// 机研磨
/// </summary>
public int Machinegrind { get; set; }
/// <summary>
/// 工作时间
/// </summary>
public DateTime? JobDatetime05 { get; set; }
/// <summary>
/// 精研磨
/// </summary>
public int Finegrind { get; set; }
/// <summary>
/// 工作时间
/// </summary>
public DateTime? JobDatetime06 { get; set; }
/// <summary>
/// 入库检查
/// </summary>
public int WarehouseInspection { get; set; }
/// <summary>
/// 工作时间
/// </summary>
public DateTime? JobDatetime07 { get; set; }
/// <summary>
/// 出货
/// </summary>
public int Shipment { get; set; }
/// <summary>
/// 工作时间
/// </summary>
public DateTime? JobDatetime08 { get; set; }
}

23
DOAN.Service/MES/Group/AchievementService.cs
View File

@ -32,34 +32,27 @@ namespace DOAN.Service.MES.Group
Worker = it.Worker,
MaterialUse=SqlFunc.Subqueryable<ProReportwork01>().Where(x=>x.Worker==it.Worker&&x.ProcessId==10).Where(predicate.ToExpression()).Sum(x=>x.FinishNum??0),
JobDatetime01=SqlFunc.Subqueryable<ProReportwork01>().Where(x=>x.Worker==it.Worker&&x.ProcessId==10).Where(predicate.ToExpression()).Max(x=>x.JobDateTime),
MechanicalProcessing = SqlFunc.Subqueryable<ProReportwork01>().Where(x => x.Worker == it.Worker && x.ProcessId == 20).Where(predicate.ToExpression()).Sum(x => x.FinishNum ?? 0),
JobDatetime02 = SqlFunc.Subqueryable<ProReportwork01>().Where(x => x.Worker == it.Worker && x.ProcessId == 20).Where(predicate.ToExpression()).Max(x => x.JobDateTime),
MiddleCheck = SqlFunc.Subqueryable<ProReportwork01>().Where(x => x.Worker == it.Worker && x.ProcessId == 10).Where(predicate.ToExpression()).Sum(x => x.FinishNum ?? 0),
JobDatetime03 = SqlFunc.Subqueryable<ProReportwork01>().Where(x => x.Worker == it.Worker && x.ProcessId == 10).Where(predicate.ToExpression()).Max(x => x.JobDateTime),
Handgrind = SqlFunc.Subqueryable<ProReportwork01>().Where(x => x.Worker == it.Worker && x.ProcessId == 10).Where(predicate.ToExpression()).Sum(x => x.FinishNum ?? 0),
JobDatetime04 = SqlFunc.Subqueryable<ProReportwork01>().Where(x => x.Worker == it.Worker && x.ProcessId == 10).Where(predicate.ToExpression()).Max(x => x.JobDateTime),
Machinegrind = SqlFunc.Subqueryable<ProReportwork01>().Where(x => x.Worker == it.Worker && x.ProcessId == 10).Where(predicate.ToExpression()).Sum(x => x.FinishNum ?? 0),
JobDatetime05 = SqlFunc.Subqueryable<ProReportwork01>().Where(x => x.Worker == it.Worker && x.ProcessId == 10).Where(predicate.ToExpression()).Max(x => x.JobDateTime),
Finegrind = SqlFunc.Subqueryable<ProReportwork01>().Where(x => x.Worker == it.Worker && x.ProcessId == 10).Where(predicate.ToExpression()).Sum(x => x.FinishNum ?? 0),
JobDatetime06 = SqlFunc.Subqueryable<ProReportwork01>().Where(x => x.Worker == it.Worker && x.ProcessId == 10).Where(predicate.ToExpression()).Max(x => x.JobDateTime),
WarehouseInspection = SqlFunc.Subqueryable<ProReportwork01>().Where(x => x.Worker == it.Worker && x.ProcessId == 10).Where(predicate.ToExpression()).Sum(x => x.FinishNum ?? 0),
JobDatetime07 = SqlFunc.Subqueryable<ProReportwork01>().Where(x => x.Worker == it.Worker && x.ProcessId == 10).Where(predicate.ToExpression()).Max(x => x.JobDateTime),
Shipment = SqlFunc.Subqueryable<ProReportwork01>().Where(x => x.Worker == it.Worker && x.ProcessId == 10).Where(predicate.ToExpression()).Sum(x => x.FinishNum ?? 0),
JobDatetime08 = SqlFunc.Subqueryable<ProReportwork01>().Where(x => x.Worker == it.Worker && x.ProcessId == 10).Where(predicate.ToExpression()).Max(x => x.JobDateTime),
}).Distinct().ToList();
}