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

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -2838,7 +2838,7 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView(false, ex.Message));
             }
         }
-       
+
         /// <summary>
         /// 根据团组Id查询团组增减款项
         /// </summary>
@@ -5051,7 +5051,7 @@ namespace OASystem.API.Controllers
         /// <returns></returns>
         [HttpPost]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
-        public async Task<IActionResult> PostEnterExitCostOneClickClear(EnterExitCostOneClickClearDto dto) 
+        public async Task<IActionResult> PostEnterExitCostOneClickClear(EnterExitCostOneClickClearDto dto)
         {
             if (dto.DiId < 1) return Ok(JsonView(false, "请传入有效的DiId参数；"));
             if (dto.UserId < 1) return Ok(JsonView(false, "请传入有效的UserId参数；"));
@@ -9222,7 +9222,7 @@ namespace OASystem.API.Controllers
             }
 
         }
-       
+
         /// <summary>
         /// 导出确认单
         /// </summary>
@@ -9937,22 +9937,22 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> PostHotelReservationsCreateVoucher(HotelReservationsCreateVoucherDto _dto)
         {
-                #region  参数验证
-                if (_dto.UserId < 1) return Ok(JsonView(false, "员工Id为空"));
-                if (_dto.PageId < 1) _dto.PageId = 28; //酒店预定Id
-                if (_dto.DiId < 1) return Ok(JsonView(false, "团组Id为空"));
+            #region  参数验证
+            if (_dto.UserId < 1) return Ok(JsonView(false, "员工Id为空"));
+            if (_dto.PageId < 1) _dto.PageId = 28; //酒店预定Id
+            if (_dto.DiId < 1) return Ok(JsonView(false, "团组Id为空"));
 
-                #region 团组操作权限验证 76 酒店预定模块
-                var groupAuthView = await GeneralMethod.PostGroupOperationAuth(_dto.DiId, _dto.UserId, 76);
-                if (groupAuthView.Code != 0) return Ok(JsonView(false, groupAuthView.Msg));
-                #endregion
+            #region 团组操作权限验证 76 酒店预定模块
+            var groupAuthView = await GeneralMethod.PostGroupOperationAuth(_dto.DiId, _dto.UserId, 76);
+            if (groupAuthView.Code != 0) return Ok(JsonView(false, groupAuthView.Msg));
+            #endregion
 
-                PageFunAuthViewBase pageFunAuthView = new PageFunAuthViewBase();
+            PageFunAuthViewBase pageFunAuthView = new PageFunAuthViewBase();
 
-                #region 页面操作权限验证
-                pageFunAuthView = await GeneralMethod.PostUserPageFuncDatas(_dto.UserId, _dto.PageId);
+            #region 页面操作权限验证
+            pageFunAuthView = await GeneralMethod.PostUserPageFuncDatas(_dto.UserId, _dto.PageId);
 
-                if (pageFunAuthView.FilesDownloadAuth == 0) return Ok(JsonView(false, "您没有文件下载权限!"));
+            if (pageFunAuthView.FilesDownloadAuth == 0) return Ok(JsonView(false, "您没有文件下载权限!"));
 
             #endregion
 
@@ -9972,7 +9972,7 @@ namespace OASystem.API.Controllers
             #region 数据处理
 
             List<int> guestIds = new List<int>();
-            int index = 0; 
+            int index = 0;
             foreach (var item in hrDtas)
             {
                 if (item.GuestName.Contains(","))
@@ -9980,7 +9980,7 @@ namespace OASystem.API.Controllers
                     string[] guestIdArr = item.GuestName.Split(',');
                     foreach (var guestIdStr in guestIdArr)
                     {
-                        bool guestBool = int.TryParse(guestIdStr,out int guestId);
+                        bool guestBool = int.TryParse(guestIdStr, out int guestId);
                         if (guestBool)
                         {
                             guestIds.Add(guestId);
@@ -10007,21 +10007,21 @@ namespace OASystem.API.Controllers
                 guestIds = guestIds.Distinct().ToList();
 
                 var guestDatas = await _sqlSugar.Queryable<Crm_DeleClient>().Where(it => it.IsDel == 0 && guestIds.Contains(it.Id)).ToListAsync();
-                if (guestDatas.Count > 0 )
+                if (guestDatas.Count > 0)
                 {
                     guestNames = "";
-                    foreach ( var guest in guestDatas ) 
+                    foreach (var guest in guestDatas)
                     {
                         string guestName = "";
                         if (guest.Sex == 0) guestName += @"MR.";
                         else if (guest.Sex == 1) guestName += @"MS.";
 
                         if (guest.Pinyin == null) guestName += $"{string.Join("", guest.LastName.GetTotalPingYin()).ToUpper()}/{string.Join("", guest.FirstName.GetTotalPingYin()).ToUpper()}";
-                        else guestName += @$"{guest.Pinyin.Replace(" ","")}";
+                        else guestName += @$"{guest.Pinyin.Replace(" ", "")}";
 
                         guestNames += @$"{guestName.Trim()}、";
                     }
-                    if (guestNames.Length > 0 )
+                    if (guestNames.Length > 0)
                     {
                         guestNames = guestNames.Substring(0, guestNames.Length - 1);
                     }
@@ -10049,7 +10049,7 @@ namespace OASystem.API.Controllers
             for (int i = 1; i <= vouchers.Count; i++)
             {
 
-                HotelVoucherInfoView hviv = vouchers[i-1];
+                HotelVoucherInfoView hviv = vouchers[i - 1];
 
                 builder.MoveToCell(0, i, 0, 0);
                 builder.Write(hviv.HotelName);
@@ -10069,7 +10069,7 @@ namespace OASystem.API.Controllers
             }
 
             //删除多余行
-            int currRowIndex = vouchers.Count+1;
+            int currRowIndex = vouchers.Count + 1;
             int delRows = 21 - currRowIndex;
             if (delRows > 0)
             {
@@ -11044,9 +11044,19 @@ namespace OASystem.API.Controllers
                 //循环赋值
                 for (int i = 0; i < DcList.Count; i++)
                 {
-                    string PY_Last = DcList[i].Pinyin.Split('/')[0];
-                    string PY_First = DcList[i].Pinyin.Split('/')[1];
-                    string PYName = PY_First + " " + PY_Last;
+                    string PYName = "";
+                    if (DcList[i].Pinyin.Length > 0 && DcList[i].Pinyin.IndexOf('/') > -1)
+                    {
+                        string PY_Last = DcList[i].Pinyin.Split('/')[0];
+                        string PY_First = DcList[i].Pinyin.Split('/')[1];
+                        PYName = PY_First + " " + PY_Last;
+                    }
+                    else
+                    {
+                        string PY_Last = DcList[i].LastName.GetTotalPingYin().Count > 0 ? DcList[i].LastName.GetTotalPingYin()[0].ToUpper() : "";
+                        string PY_First = DcList[i].FirstName.GetTotalPingYin().Count > 0 ? DcList[i].FirstName.GetTotalPingYin()[0].ToUpper() : "";
+                        PYName = PY_First + " " + PY_Last;
+                    }
                     builder.MoveToCell(0, i + 1, 0, 0);
                     builder.Write(PYName);
 
@@ -11103,7 +11113,7 @@ namespace OASystem.API.Controllers
                             }
                         }
                     }
-                    catch (Exception)
+                    catch (Exception ex)
                     {
 
                     }