yuanrf hai 1 semana
pai
achega
84a923e949
Modificáronse 1 ficheiros con 11 adicións e 5 borrados
  1. 11 5
      OASystem/OASystem.Api/Controllers/GroupsController.cs

+ 11 - 5
OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -11254,7 +11254,7 @@ FROM
             //拉车
             if (dto.PullCartFeeDetails?.Any() == true)
             {
-                var feeLabel = string.Join("、", 
+                var feeLabel = string.Join("、",
                     dto.PullCartFeeDetails.Select(x =>
                         $"{x.Quote:#0.00} CNY"
                     ));
@@ -11290,7 +11290,8 @@ FROM
             decimal gwcQuote = quote;
             decimal tdcQuote = quote;
 
-            var view = new { 
+            var view = new
+            {
                 label = label.ToString(),
                 jjcQuote,
                 gwcQuote,
@@ -32340,12 +32341,15 @@ ORDER BY
         public async Task<IActionResult> ConferenceProceduresFileDown(ConferenceProceduresFileDownDto dto)
         {
 
+            var jw = JsonView(false, "团组信息不存在");
+            jw.Data = string.Empty;
+
             var groupInfo = await _sqlSugar.Queryable<Grp_DelegationInfo>()
                 .Where(x => x.Id == dto.GroupId && x.IsDel == 0)
                 .FirstAsync();
             if (groupInfo == null)
             {
-                return Ok(JsonView(false, "团组信息不存在", ""));
+                return Ok(jw);
             }
 
             var conferenceProceduresList = await _sqlSugar.Queryable<Grp_ConferenceProcedures>()
@@ -32354,13 +32358,15 @@ ORDER BY
 
             if (!conferenceProceduresList.Any())
             {
-                return Ok(JsonView(false, "会务流程信息不存在", ""));
+                jw.Msg = "会务流程信息不存在";
+                return Ok(jw);
             }
 
             var filePath = $"{AppSettingsHelper.Get("ExcelBasePath")}Template/会务流程.xlsx";
             if (!System.IO.File.Exists(filePath))
             {
-                return Ok(JsonView(false, "模板文件不存在", ""));
+                jw.Msg = "模板文件不存在";
+                return Ok(jw);
             }
 
             var designer = new WorkbookDesigner();