Browse Source

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

jiangjc 1 month ago
parent
commit
f5719b70d6
1 changed files with 12 additions and 2 deletions
  1. 12 2
      OASystem/OASystem.Api/Controllers/GroupsController.cs

+ 12 - 2
OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -1,4 +1,5 @@
 using Aspose.Cells;
+using Aspose.Cells.Charts;
 using Aspose.Words;
 using Aspose.Words.Drawing;
 using Aspose.Words.Tables;
@@ -10998,6 +10999,9 @@ ORDER by  gctggrc.id DESC
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> PostHotelReservationsAddOrEdit(HotelReservationsAddOrEditDto _dto)
         {
+
+          
+
             #region  参数验证
             if (_dto.UserId < 1) return Ok(JsonView(false, "员工Id为空"));
             if (_dto.PageId < 1) _dto.PageId = 28; //酒店预定Id
@@ -11036,8 +11040,12 @@ ORDER by  gctggrc.id DESC
 
             #region 应用推送
 
+
+
+
             try
             {
+
                 int ccpId = (int)_view.Data.GetType().GetProperty("ccpId").GetValue(_view.Data, null);
                 int sign = (int)_view.Data.GetType().GetProperty("sign").GetValue(_view.Data, null);
                 int hotelId = (int)_view.Data.GetType().GetProperty("hotelId").GetValue(_view.Data, null);
@@ -11052,14 +11060,16 @@ ORDER by  gctggrc.id DESC
                 if (_dto.Id == 0) content = $"[新增-酒店费用录入({groupInfo?.TeamName ?? "-"})]一项费用:{(ccpInfo.PayMoney * ccpInfo.DayRate).ToString("#0.00")} CNY;";
                 else if (_dto.Id > 0) content = $"[更新-酒店费用录入({groupInfo?.TeamName ?? "-"})]一项费用:{(ccpInfo.PayMoney * ccpInfo.DayRate).ToString("#0.00")} CNY;";
 
+                Logs($"【iOS推送通知Exception】Start");
                 await GeneralMethod.iOS_PushNotifications("051", title, "", content);
-                _logger.LogInformation($"【iOS推送通知Exception】End");
+                Logs($"【iOS推送通知Exception】End ");
+
             }
             catch (Exception ex)
             {
                 _logger.LogInformation($"【iOS推送通知Exception】【{ex.Message}】");
                 Log.Error($"【iOS推送通知Exception】【{ex.Message}】");
-
+                Logs($"【iOS推送通知Exception】【{ex.Message}】");
             }
 
             try