瀏覽代碼

财务绩效初始数据、详情编写

Lyyyi 1 周之前
父節點
當前提交
101b6ad16a

+ 14 - 0
OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -5122,6 +5122,20 @@ ORDER BY MonthNumber, CollectionDays";
             return Ok(await _companyDailyKyiRep.FinanceInit());
         }
 
+
+        /// <summary>
+        /// 财务部 日常绩效 详情
+        /// </summary>
+        /// <param name="month">月份(2025-12)</param>
+        /// <param name="evaluator">考核人</param>
+        /// <returns></returns>
+        [HttpGet]
+        public async Task<IActionResult> FinanceKpiInfos(string month, int evaluator)
+        {
+            return Ok(await _companyDailyKyiRep.FinanceInfo(month, evaluator));
+        }
+
+
         #endregion
 
         #endregion

+ 5 - 0
OASystem/OASystem.Domain/ViewModels/PersonnelModule/CompanyDailyKpiView.cs

@@ -12,6 +12,11 @@
         /// </summary>
         public string Month { get; set; }
 
+        /// <summary>
+        /// 序号
+        /// </summary>
+        public string No { get; set; }
+
         /// <summary>
         /// 考核人 Id
         /// </summary>

+ 4 - 3
OASystem/OASystem.Infrastructure/Repositories/PersonnelModule/CompanyDailyKpiRepository.cs

@@ -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,