3 Commits 559a096bad ... 935666aefd

Auteur SHA1 Message Date
  yuanrf 935666aefd Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop il y a 2 mois
  yuanrf 7a2ae1f13d Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop il y a 2 mois
  yuanrf a815aaae64 ++ il y a 2 mois

+ 6 - 1
OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -3424,6 +3424,7 @@ OPTION (MAXRECURSION 0); -- 允许无限递归      ";
                 x.VisitDate,
                 x.Id,
                 CreateTime = x.CreateTime,
+                x.StepOperationTime,
             })
             .ToListAsync();
 
@@ -3459,8 +3460,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";
                 }
             }