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

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -3625,13 +3625,15 @@ namespace OASystem.API.Controllers
         /// <returns></returns>
         private CompanyInfo ExpenseCompanyByTeamId(int teamId)
         {
-            var _companyInfo = new CompanyInfo()
+            
+            var companyInfo = new CompanyInfo()
             {
                 Id = 2,
                 ConpanyName = "四川泛美交流有限公司"
             };
 
-            var _SiChuan = new List<int>() {
+            //四川泛美
+            var siChuanFanMei = new List<int>() {
                 38,  // 政府团
                 39,  // 企业团
                 40,  // 散客团
@@ -3641,24 +3643,35 @@ namespace OASystem.API.Controllers
                 762, // 四川-赛事项目收入
                 1048,//高校团
             };
-            var _ChengDu = new List<int>() {
+
+            // 成都泛美
+            var chengDuFanMei = new List<int>() {
                 302,  // 成都-会务活动
                 1047, // 成都-赛事项目收入
             };
 
-            if (_SiChuan.Contains(teamId))
+            // 成都纽茵
+            var chengDuNiuYin = new List<int>() {
+                1539,  // 纽茵-会务活动
+            };
+
+            if (siChuanFanMei.Contains(teamId))
             {
-                _companyInfo.Id = 2;
-                _companyInfo.ConpanyName = "四川泛美交流有限公司";
+                companyInfo.Id = 2;
+                companyInfo.ConpanyName = "四川泛美交流有限公司";
             }
-
-            if (_ChengDu.Contains(teamId))
+            else if (chengDuFanMei.Contains(teamId))
             {
-                _companyInfo.Id = 1;
-                _companyInfo.ConpanyName = "成都泛美商务有限公司";
+                companyInfo.Id = 1;
+                companyInfo.ConpanyName = "成都泛美商务有限公司";
             }
 
-            return _companyInfo;
+            else if (chengDuNiuYin.Contains(teamId))
+            {
+                companyInfo.Id = 3;
+                companyInfo.ConpanyName = "成都纽茵教育科技有限公司";
+            }
+            return companyInfo;
         }
 
         /// <summary>
@@ -4623,10 +4636,7 @@ namespace OASystem.API.Controllers
                 tree_Fin_DailyFeePaymentResult dailyResult = PayRequest_DailyByDateRange(2, checkedView.DailyPaymentIds, dto.beginDt, dto.endDt);
                 tree_Group_DailyFeePaymentResult groupResult = PayRequest_GroupPaymentByDateRange(2, checkedView.GroupIds, checkedView.HotelSubIds, dto.beginDt, dto.endDt);
 
-                if (dailyResult.childList == null)
-                {
-                    dailyResult.childList = new List<Fin_DailyFeePaymentContentInfolView>();
-                }
+                dailyResult.childList ??= new List<Fin_DailyFeePaymentContentInfolView>();
 
                 var _GroupData = new List<tree_Group_DailyFeePaymentPageListView>();
                 var _DailyData = new List<tree_Fin_DailyFeePaymentPageListView>();
@@ -4665,7 +4675,6 @@ namespace OASystem.API.Controllers
                 //    return Ok(JsonView(false, "参数ConpanyId不可使用!"));
                 //}
 
-
                 var designer = new WorkbookDesigner
                 {
                     Workbook = new Workbook(AppSettingsHelper.Get("ExcelBasePath") + "Template/付款申请书.xls")

OASystem/OASystem.Infrastructure/Repositories/Groups/EnterExitCostRepository.cs

@@ -811,10 +811,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
             var datas = await _sqlSugar
                 .Queryable<Sys_SetData>()
                 .Where(x => x.IsDel == 0 && (x.STid == 72 || x.STid == 73))
-
                 .ToListAsync();
 
-
             var wordTypeData = datas.Where(x => x.STid == 72 && x.Remark.Contains(provinceId.ToString()))
                                 .Select(x => new SetDataInfoView()
                                 {
@@ -834,6 +832,5 @@ namespace OASystem.Infrastructure.Repositories.Groups
 
             return (wordTypeData, excelTypeData);
         }
-
     }
 }