1、团组模块 - 出入境费用 --> 更改文件下载返回View

2、查询团组简略详情列表(PostGroupListByCTableAndUserId) --> 优化返回数据源

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -5671,8 +5671,8 @@ FROM
                         doc.Save(AppSettingsHelper.Get("WordBasePath") + "EnterExitCost/File/" + strFileName);
                         string url = AppSettingsHelper.Get("WordBaseUrl") + "Office/Word/EnterExitCost/File/" + strFileName;
 
-                        if (dto.PortType == 1) return Ok(JsonView(true, "成功", new { Url = url }));
-                        else if (dto.PortType == 2 || dto.PortType == 3) return Ok(JsonView(true, "成功", url));
+                        if (dto.PortType == 1 || dto.PortType == 3) return Ok(JsonView(true, "成功", new { Url = url }));
+                        else if (dto.PortType == 2 ) return Ok(JsonView(true, "成功", url));
                     }
                     else if (dto.SubTypeId == 1006)//1006(因公出国（境）经费测算明细表)
                     {
@@ -5895,8 +5895,8 @@ FROM
                         doc.Save(AppSettingsHelper.Get("WordBasePath") + "EnterExitCost/File/" + strFileName);
                         string url = AppSettingsHelper.Get("WordBaseUrl") + "Office/Word/EnterExitCost/File/" + strFileName;
 
-                        if (dto.PortType == 1) return Ok(JsonView(true, "成功", new { Url = url }));
-                        else if (dto.PortType == 2 || dto.PortType == 3) return Ok(JsonView(true, "成功", url));
+                        if (dto.PortType == 1 || dto.PortType == 3) return Ok(JsonView(true, "成功", new { Url = url }));
+                        else if (dto.PortType == 2 ) return Ok(JsonView(true, "成功", url));
                     }
                     else if (dto.SubTypeId == 1007) //1007(四川省商务厅出国经费财政先行审核表)
                     {
@@ -6136,7 +6136,8 @@ FROM
                         string strFileName = $"{_DelegationInfo.TeamName}-四川省商务厅出国经费财政先行审核表{DateTime.Now.ToString("yyyyMMddHHmmss")}.xls";
                         designer.Workbook.Save(AppSettingsHelper.Get("WordBasePath") + "EnterExitCost/File/" + strFileName);
                         string url = AppSettingsHelper.Get("WordBaseUrl") + "Office/Word/EnterExitCost/File/" + strFileName;
-                        return Ok(JsonView(true, "成功", new { Url = url }));
+                        if (dto.PortType == 1 || dto.PortType == 3) return Ok(JsonView(true, "成功", new { Url = url }));
+                        else if (dto.PortType == 2) return Ok(JsonView(true, "成功", url));
                     }
                     else if (dto.SubTypeId == 1066) //成都市因公临时出国任务和预算审批意见表(外专培训团专用)
                     {
@@ -6317,8 +6318,8 @@ FROM
                         doc.Save(AppSettingsHelper.Get("WordBasePath") + "EnterExitCost/File/" + strFileName);
                         string url = AppSettingsHelper.Get("WordBaseUrl") + "Office/Word/EnterExitCost/File/" + strFileName;
 
-                        if (dto.PortType == 1) return Ok(JsonView(true, "成功", new { Url = url }));
-                        else if (dto.PortType == 2 || dto.PortType == 3) return Ok(JsonView(true, "成功", url));
+                        if (dto.PortType == 1 || dto.PortType == 3) return Ok(JsonView(true, "成功", new { Url = url }));
+                        else if (dto.PortType == 2) return Ok(JsonView(true, "成功", url));
                     }
                 }
                 else if (dto.ExportType == 2) //表格
@@ -6566,8 +6567,8 @@ FROM
                         doc.Save(AppSettingsHelper.Get("WordBasePath") + "EnterExitCost/File/" + strFileName);
                         string url = AppSettingsHelper.Get("WordBaseUrl") + "Office/Word/EnterExitCost/File/" + strFileName;
 
-                        if (dto.PortType == 1) return Ok(JsonView(true, "成功", new { Url = url }));
-                        else if (dto.PortType == 2 || dto.PortType == 3) return Ok(JsonView(true, "成功", url));
+                        if (dto.PortType == 1 || dto.PortType == 3) return Ok(JsonView(true, "成功", new { Url = url }));
+                        else if (dto.PortType == 2) return Ok(JsonView(true, "成功", url));
                     }
                 }
                 else if (dto.ExportType == 3)
@@ -6626,8 +6627,8 @@ FROM
 
                         string url = AppSettingsHelper.Get("WordBaseUrl") + "Office/Word/EnterExitCost/File/" + strFileName;
 
-                        if (dto.PortType == 1) return Ok(JsonView(true, "成功", new { Url = url }));
-                        else if (dto.PortType == 2 || dto.PortType == 3) return Ok(JsonView(true, "成功", url));
+                        if (dto.PortType == 1 || dto.PortType == 3) return Ok(JsonView(true, "成功", new { Url = url }));
+                        else if (dto.PortType == 2) return Ok(JsonView(true, "成功", url));
                     }
                 }