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

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -6762,7 +6762,7 @@ namespace OASystem.API.Controllers
         /// <param name="dto"></param>
         /// <returns></returns>
         [HttpPost]
-        public IActionResult ExportTravel(InitOpTravelDto dto)
+        public IActionResult ExportTravel(ExportTravelDto dto)
         {
             var jw = JsonView(false);
             int diid = 0;
@@ -6938,13 +6938,22 @@ namespace OASystem.API.Controllers
 
                 }
             }
-            string path = savePath + Find.TeamName + "出访日程.docx";
-            string ftpPath = AppSettingsHelper.Get("WordBaseUrl") + AppSettingsHelper.Get("WordFtpPath") + "Travel/export/" + Find.TeamName + "出访日程.docx";
+            string path = savePath + Find.TeamName + "出访日程";
+            string ftpPath = AppSettingsHelper.Get("WordBaseUrl") + AppSettingsHelper.Get("WordFtpPath") + "Travel/export/" + Find.TeamName + "出访日程";
 
             try
             {
-                doc.Save(path, Aspose.Words.SaveFormat.Doc);
-                jw = JsonView(true, "导出成功", ftpPath);
+
+                Aspose.Words.SaveFormat saveFormat = Aspose.Words.SaveFormat.Doc;
+                string postfix = ".docx";
+                if (dto.IsPDF == 1)
+                {
+                    saveFormat = Aspose.Words.SaveFormat.Pdf;
+                    postfix = ".pdf";
+                }
+
+                doc.Save(path + postfix, saveFormat);
+                jw = JsonView(true, "导出成功", ftpPath + postfix);
             }
             catch (Exception)
             {
@@ -11816,7 +11825,7 @@ ORDER by  gctggrc.id DESC
             #endregion
             if (dto.PortType == 1 || dto.PortType == 2 || dto.PortType == 3) // web/Android
             {
-                var res = ExportTravel(new InitOpTravelDto() { Diid = dto.diId });
+                var res = ExportTravel(new ExportTravelDto() { Diid = dto.diId });
                 return Ok(res.GetType().GetProperty("Value").GetValue(res, null));
             }
             else

OASystem/OASystem.Domain/Dtos/Groups/CarTouristGuideGroundDto.cs

@@ -210,6 +210,13 @@ namespace OASystem.Domain.Dtos.Groups
         public int Diid { get; set;}
     }
 
+    public class ExportTravelDto
+    {
+        public int Diid { get; set; }
+
+        public int IsPDF { get; set; } = 0;
+    }
+
     public class DelOpTravelDto
     {
         public int Diid { get; set; }