修改机票默认操作人

OASystem/OASystem.Api/OAMethodLib/GeneralMethod.cs

@@ -43,7 +43,7 @@ namespace OASystem.API.OAMethodLib
         private static readonly SetDataRepository _setDataRep = AutofacIocManager.Instance.GetService<SetDataRepository>();
         private static readonly TableOperationRecordRepository _tableOperationRecordRep = AutofacIocManager.Instance.GetService<TableOperationRecordRepository>();
         private static readonly MessageRepository _messageRep = AutofacIocManager.Instance.GetService<MessageRepository>();
-        
+
         private static readonly IHubContext<ChatHub, IChatClient> _hubContext = AutofacIocManager.Instance.GetService<IHubContext<ChatHub, IChatClient>>();
 
         private readonly static string[] weekdays = new string[] { "星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六" };
@@ -160,7 +160,7 @@ namespace OASystem.API.OAMethodLib
             {
                 pageData.AddRange(_defaultData.Find(it => it.DepId == 0)?.PostPageAuths[0].PageIds ?? new List<int>());
             }
-           
+
 
             if (pageData.Count > 0)
             {
@@ -1079,10 +1079,10 @@ namespace OASystem.API.OAMethodLib
         /// <param name="groupId"></param>
         /// <returns></returns>
         public static List<GroupOperationUserView> GetGroupModuleOperators(int groupId)
-        { 
+        {
             var modoule = new GroupOperationUserView();
             var view = modoule.GetOperationUsersInit();
-            if(groupId < 1) return view;
+            if (groupId < 1) return view;
             var groupInfo = _sqlSugar.Queryable<Grp_DelegationInfo>()
                 .Where(it => it.IsDel == 0 && it.Id == groupId)
                 .First();
@@ -1091,7 +1091,7 @@ namespace OASystem.API.OAMethodLib
             //获取团组下的操作人
             //车/导游地接
             var opUers = _sqlSugar.Queryable<Grp_CarTouristGuideGroundReservations>()
-                .InnerJoin<Grp_CreditCardPayment>((x,y) => x.Id == y.CId && y.CTable == 79)
+                .InnerJoin<Grp_CreditCardPayment>((x, y) => x.Id == y.CId && y.CTable == 79)
                 .LeftJoin<Sys_Users>((x, y, u) => x.CreateUserId == u.Id)
                 .Where((x, y, u) => x.DiId == groupId && x.IsDel == 0)
                 .Select((x, y, u) => new GroupOperationUserInfo
@@ -1185,7 +1185,7 @@ namespace OASystem.API.OAMethodLib
                     new(){ CTableId = 82,CTableName = "团组客户保险" },
                     new(){ CTableId = 81,CTableName = "邀请/公务活动" },
                     new(){ CTableId = 85,CTableName = "机票预订",
-                        OperationUsers=new List<GroupOperationUserInfo>(){ new() {UserId = 269, UserName = "汪燕平" } }  },
+                        OperationUsers=new List<GroupOperationUserInfo>(){ new() {UserId = 385, UserName = "雍婷玉" } }  },
                     new(){ CTableId = 98,CTableName = "其他款项" },
                 };
 
@@ -2369,7 +2369,7 @@ namespace OASystem.API.OAMethodLib
                             return !excludeArr.Contains(x);
                         }).Count() != 9)
                         {
-                            dt.Rows.Add(null, null, null, null, null, null, null, null, null, null, null, "本团组第" + (i + 1) + "段黑屏代码中第" + (j + 1) + " 条有误,请联系机票同事核对", null, false,false);
+                            dt.Rows.Add(null, null, null, null, null, null, null, null, null, null, null, "本团组第" + (i + 1) + "段黑屏代码中第" + (j + 1) + " 条有误,请联系机票同事核对", null, false, false);
                             //MessageBoxEx.Show("第" + (i + 1) + "段黑屏代码中第" + (j + 1) + " 条有误, 请联系机票同事核对");
                             return dt;
                         }
@@ -4141,18 +4141,21 @@ namespace OASystem.API.OAMethodLib
             DateTime? currDt = null;
 
             var currTimezones = _timeZoneCityMappings.Where(x => x.Value.Contains(city)).ToList();
-            if (!currTimezones.Any()) {
+            if (!currTimezones.Any())
+            {
 
                 currTimezones = _timeZoneCityMappings.Where(x => x.Value.Contains(country)).ToList();
 
 
-            };
+            }
+            ;
             string timeZoneId = string.Empty;
             if (currTimezones.Count > 1)
             {
                 currTimezones = currTimezones.Where(x => x.Value.Contains(country)).ToList();
                 timeZoneId = currTimezones.FirstOrDefault().Key ?? string.Empty;
-            }else timeZoneId = currTimezones.FirstOrDefault().Key ?? string.Empty;
+            }
+            else timeZoneId = currTimezones.FirstOrDefault().Key ?? string.Empty;
 
             if (string.IsNullOrEmpty(timeZoneId)) return currDt;
 
@@ -4181,7 +4184,7 @@ namespace OASystem.API.OAMethodLib
         /// <param name="footerLabel">页脚内容</param>
         /// <param name="font">字体名称</param>
         /// <param name="fontSize"><字体大小/param>
-        public static void AsposeWordSetFooter(DocumentBuilder builder,string footerLabel,string font,int fontSize)
+        public static void AsposeWordSetFooter(DocumentBuilder builder, string footerLabel, string font, int fontSize)
         {
             Section currentSection = builder.CurrentSection;
             var pageSetup = currentSection.PageSetup;
@@ -4298,9 +4301,9 @@ namespace OASystem.API.OAMethodLib
         /// <param name="groupId"></param>
         /// <param name="checkCurrencys">已使用币种</param>
         /// <returns></returns>
-        public static async Task<(bool,string, List<CurrencyInfo>)> EnterExitCostCheckRate(int groupId,List<CurrencyInfo> checkCurrencys)
+        public static async Task<(bool, string, List<CurrencyInfo>)> EnterExitCostCheckRate(int groupId, List<CurrencyInfo> checkCurrencys)
         {
-            if (checkCurrencys == null || checkCurrencys.Count < 1) return (false, string.Empty,new List<CurrencyInfo>());
+            if (checkCurrencys == null || checkCurrencys.Count < 1) return (false, string.Empty, new List<CurrencyInfo>());
 
             var info = await _sqlSugar.Queryable<Grp_EnterExitCost>().FirstAsync(x => x.IsDel == 0 && x.DiId == groupId);
             if (info == null) return (false, string.Empty, new List<CurrencyInfo>());
@@ -5721,7 +5724,7 @@ namespace OASystem.API.OAMethodLib
                         var redisKeyName = string.Format("AirTripDesc_{0}_{1}", x.DiId, x.Id);
                         tripDesc = await KIMIAirTripCodeRec(redisKeyName, x.BlackCode);
                     }
-                    
+
 
                     result.Add(new EntryAndExitTipsView
                     {