Browse Source

优化代码结构和简化默认值设置

在 `Grp_EnterExitCost.cs` 中移除多余的 `using` 语句,添加 `SugarTable` 特性,并更新属性描述。
在 `DelegationInfoRepository.cs` 中调整 SQL 查询参数格式,修改 `ProvinceId` 默认值为 `0`。
在 `EnterExitCostRepository.cs` 中简化 `Result` 对象的创建方式和 `subData` 的声明,统一将 `provinceId` 默认值设为 `0`。
Lyyyi 1 week ago
parent
commit
2b221e7a97

+ 3 - 10
OASystem/OASystem.Domain/Entities/Groups/Grp_EnterExitCost.cs

@@ -1,11 +1,4 @@
-using OASystem.Domain.Enums;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace OASystem.Domain.Entities.Groups
+namespace OASystem.Domain.Entities.Groups
 {
     /// <summary>
     /// 团组 - 出入境费用
@@ -74,7 +67,7 @@ namespace OASystem.Domain.Entities.Groups
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10,2)")]
         public decimal Safe { get; set; }
-        
+
         /// <summary>
         /// 第一项费用描述
         /// </summary>
@@ -202,7 +195,7 @@ namespace OASystem.Domain.Entities.Groups
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int SumGWC { get; set; }
-        
+
         /// <summary>
         ///  头等舱小计选择框
         /// </summary>

+ 2 - 2
OASystem/OASystem.Infrastructure/Repositories/Groups/DelegationInfoRepository.cs

@@ -1397,7 +1397,7 @@ FROM
   Grp_DelegationInfo di
 WHERE
   di.Isdel = 0
-  And Id = {0} ", groupId);
+  And Id = {groupId} ");
 
             var groupData = await _sqlSugar.SqlQueryable<EnterExitCostGroupNameView>(groupSql).FirstAsync();
             var provCityDatas = await ProvinceCityBasicSource();
@@ -1417,7 +1417,7 @@ WHERE
 
                 if (isDefualtVal)
                 {
-                    groupData.ProvinceId = 122; //默认四川
+                    groupData.ProvinceId = 0; //
                 }
             }
 

+ 3 - 3
OASystem/OASystem.Infrastructure/Repositories/Groups/EnterExitCostRepository.cs

@@ -327,7 +327,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                             .ToArrayAsync();
                     }
 
-                    int provinceId = 122;
+                    int provinceId = 0;
                     var groupNames = await _groupRep.EnterExitCostGroupNameInfoAsync(dto.DiId);
                     if (groupNames!=null)
                     {
@@ -483,7 +483,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
         /// <returns></returns>
         public async Task<Result> PostEnterExitCostOperate(EnterExitCostOperateDto dto)
         {
-            Result result = new Result() { Code = -1, Msg = "操作失败!" };
+            var result = new Result() { Code = -1, Msg = "操作失败!" };
 
             if (dto.SumJJC == 0) dto.OutsideJJPay = 0;
             if (dto.SumGWC == 0) dto.OutsideGWPay = 0;
@@ -493,7 +493,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
             //enterExitCost.Remark = dto.FirstItemRemark;
             //enterExitCost.InsidePay = enterExitCost.Visa + enterExitCost.YiMiao + enterExitCost.HeSuan + enterExitCost.Service + enterExitCost.Safe + enterExitCost.Ticket;
 
-            List<Grp_DayAndCost> subData = new List<Grp_DayAndCost>();
+            var subData = new List<Grp_DayAndCost>();
             var quarterageData = _mapper.Map<List<Grp_DayAndCost>>(dto.QuarterageData);  //住宿费 1
             quarterageData = quarterageData.Select(it => { it.CreateUserId = dto.UserId; return it; }).ToList();
             if (quarterageData.Count > 0) subData.AddRange(quarterageData);