|
|
@@ -284,7 +284,7 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
|
|
|
/// 日常考勤详情
|
|
|
/// </summary>
|
|
|
/// <param name="month">月份 2025-12</param>
|
|
|
- /// <param name="userId">考核人</param>
|
|
|
+ /// <param name="evaluator">考核人</param>
|
|
|
/// <returns></returns>
|
|
|
public async Task<JsonView> FinanceInfo(string month, int evaluator)
|
|
|
{
|
|
|
@@ -304,8 +304,8 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
|
|
|
var evaluatorInfo = await _sqlSugar.Queryable<Sys_Users>()
|
|
|
.LeftJoin<Sys_Company>((u, c) => u.CompanyId == c.Id)
|
|
|
.LeftJoin<Sys_Department>((u, c, d) => u.DepId == d.Id)
|
|
|
- .LeftJoin<Sys_JobPost>((u, c, d, jp) => u.JobPostId == d.Id)
|
|
|
- .Where((u, c, d, jp) => u.IsDel == 0)
|
|
|
+ .LeftJoin<Sys_JobPost>((u, c, d, jp) => u.JobPostId == jp.Id)
|
|
|
+ .Where((u, c, d, jp) => u.IsDel == 0 && u.Id == evaluator)
|
|
|
.Select((u, c, d, jp) => new
|
|
|
{
|
|
|
UserId = u.Id,
|
|
|
@@ -358,6 +358,7 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
|
|
|
info.Add(new CompanyDailyKpiView()
|
|
|
{
|
|
|
Month = month,
|
|
|
+ No = c.KpiSort,
|
|
|
EvaluatorId = evaluatorInfo.UserId,
|
|
|
Evaluator = evaluatorInfo.UserName,
|
|
|
EvalContentId = c.KpiId,
|