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

OASystem/OASystem.Api/Controllers/BaiduOCRController.cs

@@ -213,6 +213,17 @@ namespace OASystem.API.Controllers
                             {
                                 client.CompanyFullName = "暂无";
                             }
+                            if (!string.IsNullOrWhiteSpace(client.LastName + client.FirstName))
+                            {
+                                var pinyin = client.LastName.GetTotalPingYinFirst() + "/";
+                                foreach (var cn in client.FirstName)
+                                {
+                                    pinyin += cn.ToString().GetTotalPingYinFirst() + " ";
+                                }
+
+                                client.Pinyin = pinyin.TrimEnd();
+                            }
+                            
                             ClientArr.Add(client);
                         }
                     }

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -5832,6 +5832,12 @@ namespace OASystem.API.Controllers
         {
             try
             {
+                #region 参数校验
+                if (dto.Currency <= 0) return Ok(JsonView(false, "币种错误！"));
+                var di = _sqlSugar.Queryable<Grp_DelegationInfo>().First(x => x.Id == dto.DiId && x.IsDel == 0);
+                if (di == null) return Ok(JsonView(false, "团组错误！"));
+                #endregion
+
                 Result groupData = await _carTouristGuideGroundRep.OpCarTouristGuideGroundContent(dto);
                 if (groupData.Code != 0)
                 {
@@ -13018,7 +13024,9 @@ And (UnitName != '' Or UnitName != null) {sqlWhere}");
                     group.TourCode,
                     group.VisitPNumber,
                     group.TeamName,
-                    group.Id
+                    group.Id,
+                    group.VisitStartDate,
+                    group.VisitEndDate
                 },
             };
 

OASystem/OASystem.Api/OAMethodLib/GeneralMethod.cs

@@ -1021,6 +1021,31 @@ namespace OASystem.API.OAMethodLib
             return result;
         }
 
+        /// <summary>
+        /// 获取中文第一个拼音
+        /// </summary>
+        /// <param name="text"></param>
+        /// <param name="isUp"></param>
+        /// <returns></returns>
+        public static string GetTotalPingYinFirst(this string text , bool isUp = true)
+        {
+            var returnstr = string.Empty;
+            var enResult = text.GetTotalPingYin();
+            if(enResult.Count == 0)
+            {
+                returnstr =  text;
+            } 
+            else if (isUp)
+            {
+                returnstr = enResult[0].ToUpper();
+            }
+            else
+            {
+                returnstr = enResult[0].ToLower();
+            }
+            return returnstr; 
+        }
+
         /// <summary>
         /// 获取汉语拼音首字母
         /// </summary>

OASystem/OASystem.Infrastructure/Repositories/Groups/CarTouristGuideGroundRepository.cs

@@ -301,7 +301,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 if (_CreditCardPayment != null)
                 {
                     _CreditCardPayment.PayName = _sqlSugar.Queryable<Sys_SetData>().First(a => a.Id == _CreditCardPayment.PayDId).Name;
-                    _CreditCardPayment.PaymentCurrencyName = _sqlSugar.Queryable<Sys_SetData>().First(a => a.Id == _CreditCardPayment.PaymentCurrency).Name;
+                    _CreditCardPayment.PaymentCurrencyName = _sqlSugar.Queryable<Sys_SetData>().First(a => a.Id == _CreditCardPayment.PaymentCurrency)?.Name;
                     if (_CreditCardPayment.OrbitalPrivateTransfer == 0) _CreditCardPayment.OrbitalPrivateTransferStr = "公转";
                     else _CreditCardPayment.OrbitalPrivateTransferStr = "私转";
                 }