++

OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -4035,10 +4035,10 @@ OPTION (MAXRECURSION 0); -- 允许无限递归      ";
                 Directory.CreateDirectory(saveFolder);
             }
 
-            string outputFile = $"{fileName}_{DateTime.Now:yyyyMMddHHmmss}.docx";
+            string outputFile = $"{fileName}_{DateTime.Now:yyyyMMddHHmmss}.pdf";
             string filePath = Path.Combine(saveFolder, outputFile);
 
-            doc.Save(filePath, Aspose.Words.SaveFormat.Docx);
+            doc.Save(filePath, Aspose.Words.SaveFormat.Pdf);
 
             // 返回访问URL
             return $"{AppSettingsHelper.Get("WordBaseUrl")}Office/Word/PerformanceAnalysis/{outputFile}";
@@ -4169,7 +4169,10 @@ OPTION (MAXRECURSION 0); -- 允许无限递归      ";
                 DepName = d.DepName,
                 JobPostId = u.JobPostId,
                 JobName = jp.JobName,
-                WorkYears = SqlFunc.DateDiff(DateType.Year, u.Edate, DateTime.Now)
+                WorkYears = SqlFunc.DateDiff(DateType.Year, u.Edate, DateTime.Now),
+                HasPerformanceData = SqlFunc.Subqueryable<Pm_PerformanceAnalysis>()
+                    .Where(pa => pa.UserId == u.Id && pa.Year == dto.Year && pa.Month == dto.Month && pa.IsDel == 0)
+                    .Any()
             })
             .ToPageListAsync(dto.PageIndex, dto.PageSize, total);
 
@@ -4295,6 +4298,10 @@ ORDER BY MonthNumber, CollectionDays";
             public int JobPostId { get; set; }
             public string JobName { get; set; }
             public int WorkYears { get; set; }
+            /// <summary>
+            /// 是否存在绩效分析数据
+            /// </summary>
+            public bool HasPerformanceData { get; set; }
         }
 
         #endregion

OASystem/OASystem.Domain/Dtos/PersonnelModule/AiPerformanceAnalysisDtos.cs

@@ -16,6 +16,10 @@ namespace OASystem.Domain.Dtos.PersonnelModule
         /// 筛选条件 公司/部门/岗位/用户
         /// </summary>
         public string ScreeningCriteria { get; set; }
+
+        public int Year { get; set; }
+
+        public int Month { get; set; }
     }
 
     /// <summary>