Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -3149,6 +3149,7 @@ OPTION (MAXRECURSION 0); -- 允许无限递归      ";
                 x.VisitDate,
                 x.Id,
                 CreateTime = x.CreateTime,
+                x.StepOperationTime,
             })
             .ToListAsync();
 
@@ -3184,8 +3185,12 @@ OPTION (MAXRECURSION 0); -- 允许无限递归      ";
                     })
                     .ToListAsync();
 
+                    var startTime = item.VisitDate.ToString("yyyy - MM - dd");
+                    if (item.StepOperationTime.HasValue && item.StepOperationTime != DateTime.MinValue)
+                        startTime = item.StepOperationTime.Value.ToString("yyyy - MM - dd");
+
                     group_process_data += $"团组名称：{item.TeamName}，" +
-                    $"出访日期：{item.VisitDate.ToString("yyyy - MM - dd")}，团组创建时间：{item.CreateTime.ToString("yyyy - MM - dd HH:mm:ss")}，团组{config.ProcessName}进程信息如下：{JsonConvert.SerializeObject(detailList)}\r\n\r\n";
+                    $"出访日期：{startTime}，团组创建时间：{item.CreateTime.ToString("yyyy - MM - dd HH:mm:ss")}，团组{config.ProcessName}进程信息如下：{JsonConvert.SerializeObject(detailList)}\r\n\r\n";
                 }
             }
 
@@ -3403,14 +3408,14 @@ OPTION (MAXRECURSION 0); -- 允许无限递归      ";
         }
 
         /// <summary>
-        /// 机票员工分析pdf下载
+        /// 国交员工分析pdf下载
         /// </summary>
         /// <param name="year"></param>
         /// <param name="month"></param>
         /// <param name="userId"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<IActionResult> AiPerformanceAnalysis_AirTicketFileDownAsync(int year, int month, int userId)
+        public async Task<IActionResult> AiPerformanceAnalysis_GuojiaoFileDownAsync(int year, int month, int userId)
         {
             var jw = JsonView(false);