Browse Source

简化 FinancialController.cs 中的公司 ID 处理

移除 `PostPayRequestInit` 方法中的异常处理,直接返回查询到的公司数据。添加对 `dto.ConpanyId` 的动态检查,确保传入的公司 ID 有效,简化了代码逻辑并提升可维护性。注释掉了原有的公司 ID 检查逻辑,以便后续参考。

优化 FinancialController.cs 中的公司数据处理

移除 `PostPayRequestInit` 方法中的异常处理,直接返回查询到的公司数据。添加了对公司数据的查询,并动态检查传入的 `ConpanyId` 是否有效,简化了逻辑,提升了可扩展性和可维护性。同时,使用 LINQ 的 `Any()` 方法优化了数据列表的检查,增强了代码的可读性和性能。
LEIYI 2 months ago
parent
commit
ed90fd73ff
1 changed files with 50 additions and 43 deletions
  1. 50 43
      OASystem/OASystem.Api/Controllers/FinancialController.cs

+ 50 - 43
OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -2163,9 +2163,7 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> PostPayRequestInit()
         {
-            try
-            {
-                var conpanyDatas = _sqlSugar.Queryable<Sys_Company>()
+            var conpanyDatas = _sqlSugar.Queryable<Sys_Company>()
                                             .Where(it => it.IsDel == 0)
                                             .Select(it => new
                                             {
@@ -2175,12 +2173,7 @@ namespace OASystem.API.Controllers
                                             }).ToList();
 
 
-                return Ok(JsonView(true, "操作成功!", new { ConpanyData = conpanyDatas }));
-            }
-            catch (Exception ex)
-            {
-                return Ok(JsonView(false, ex.Message));
-            }
+            return Ok(JsonView(true, "操作成功!", new { ConpanyData = conpanyDatas }));
         }
 
 
@@ -3142,7 +3135,18 @@ namespace OASystem.API.Controllers
                 dto.PageId = 51;
                 return Ok(JsonView(false, "请传入有效的PageId参数!"));
             }
-            if (dto.ConpanyId < 1 || dto.ConpanyId > 4)
+
+            var conpanyDatas = _sqlSugar.Queryable<Sys_Company>()
+                .Where(it => it.IsDel == 0)
+                .Select(it => new
+                {
+                    Id = it.Id,
+                    ConpamyName = it.CompanyName
+                
+                }).ToList();
+
+            var conpanyIds = conpanyDatas.Select(x => x.Id).ToList();
+            if (!conpanyIds.Contains(dto.ConpanyId))
             {
                 return Ok(JsonView(false, "请传入有效的ConpanyId参数!"));
             }
@@ -3184,39 +3188,42 @@ namespace OASystem.API.Controllers
                     dailyResult.childList = new List<Fin_DailyFeePaymentContentInfolView>();
                 }
 
-                List<tree_Group_DailyFeePaymentPageListView> _GroupData = new List<tree_Group_DailyFeePaymentPageListView>();
-                List<tree_Fin_DailyFeePaymentPageListView> _DailyData = new List<tree_Fin_DailyFeePaymentPageListView>();
-
-                //1	成都泛美商务有限公司
-                if (dto.ConpanyId == 1)
-                {
-                    if (groupResult.dataList != null && groupResult.dataList.Count > 0) _GroupData = groupResult.dataList.Where(it => it.CompanyId == 1).ToList();
-                    if (dailyResult.dataList != null && dailyResult.dataList.Count > 0) _DailyData = dailyResult.dataList.Where(it => it.CompanyId == 1).ToList();
-
-                }
-                //2	四川泛美交流有限公司
-                else if (dto.ConpanyId == 2)
-                {
-                    if (groupResult.dataList != null && groupResult.dataList.Count > 0) _GroupData = groupResult.dataList.Where(it => it.CompanyId == 2).ToList();
-                    if (dailyResult.dataList != null && dailyResult.dataList.Count > 0) _DailyData = dailyResult.dataList.Where(it => it.CompanyId == 2).ToList();
-
-                }
-                //3 成都纽茵教育科技有限公司
-                else if (dto.ConpanyId == 3)
-                {
-                    if (groupResult.dataList != null && groupResult.dataList.Count > 0) _GroupData = groupResult.dataList.Where(it => it.CompanyId == 3).ToList();
-                    if (dailyResult.dataList != null && dailyResult.dataList.Count > 0) _DailyData = dailyResult.dataList.Where(it => it.CompanyId == 3).ToList();
-
-                }
-                //4 成都鸿企中元科技有限公司
-                else if (dto.ConpanyId == 4)
-                {
-                    return Ok(JsonView(false, "暂未开放该类型!"));
-                }
-                else
-                {
-                    return Ok(JsonView(false, "参数ConpanyId不可使用!"));
-                }
+                var _GroupData = new List<tree_Group_DailyFeePaymentPageListView>();
+                var _DailyData = new List<tree_Fin_DailyFeePaymentPageListView>();
+
+                if (groupResult.dataList.Any()) _GroupData = groupResult.dataList.Where(it => it.CompanyId == dto.ConpanyId).ToList();
+                if (dailyResult.dataList.Any()) _DailyData = dailyResult.dataList.Where(it => it.CompanyId == dto.ConpanyId).ToList();
+
+                ////1	成都泛美商务有限公司
+                //if (dto.ConpanyId == 1)
+                //{
+                //    if (groupResult.dataList != null && groupResult.dataList.Count > 0) _GroupData = groupResult.dataList.Where(it => it.CompanyId == 1).ToList();
+                //    if (dailyResult.dataList != null && dailyResult.dataList.Count > 0) _DailyData = dailyResult.dataList.Where(it => it.CompanyId == 1).ToList();
+
+                //}
+                ////2	四川泛美交流有限公司
+                //else if (dto.ConpanyId == 2)
+                //{
+                //    if (groupResult.dataList != null && groupResult.dataList.Count > 0) _GroupData = groupResult.dataList.Where(it => it.CompanyId == 2).ToList();
+                //    if (dailyResult.dataList != null && dailyResult.dataList.Count > 0) _DailyData = dailyResult.dataList.Where(it => it.CompanyId == 2).ToList();
+
+                //}
+                ////3 成都纽茵教育科技有限公司
+                //else if (dto.ConpanyId == 3)
+                //{
+                //    if (groupResult.dataList != null && groupResult.dataList.Count > 0) _GroupData = groupResult.dataList.Where(it => it.CompanyId == 3).ToList();
+                //    if (dailyResult.dataList != null && dailyResult.dataList.Count > 0) _DailyData = dailyResult.dataList.Where(it => it.CompanyId == 3).ToList();
+
+                //}
+                ////4 成都鸿企中元科技有限公司
+                //else if (dto.ConpanyId == 4)
+                //{
+                //    return Ok(JsonView(false, "暂未开放该类型!"));
+                //}
+                //else
+                //{
+                //    return Ok(JsonView(false, "参数ConpanyId不可使用!"));
+                //}
 
                 string _requestPaymentDt = DateTime.Now.ToString("yyyy-MM-dd"),//申请付款日期
                        _appliedAmount = "", //申请付款金额