Lyyyi hai 3 días
pai
achega
61e160cfa4

+ 2 - 2
OASystem/OASystem.Domain/Dtos/Groups/GroupListDto.cs

@@ -317,12 +317,12 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         /// 额外超支额度
         /// </summary>
-        public decimal ExtOverLimit { get; set; }
+        public string ExtOverLimit { get; set; }
 
         /// <summary>
         /// 额外超支额度币种
         /// </summary>
-        public int ExtOverCurrency { get; set; }
+        public string ExtOverCurrency { get; set; }
     }
 
     /// <summary>

+ 8 - 4
OASystem/OASystem.Infrastructure/Repositories/Groups/DelegationInfoRepository.cs

@@ -794,6 +794,10 @@ namespace OASystem.Infrastructure.Repositories.Groups
 
             if (dto.PortType == 1 || dto.PortType == 2 || dto.PortType == 3) //web
             {
+                //额外超支参数处理
+                decimal extOverLimit = decimal.TryParse(dto.ExtOverLimit, out decimal tempLimit) ? tempLimit : 0.00M;
+                int extOverCurrency = int.TryParse(dto.ExtOverLimit, out int tempCurrency) ? tempCurrency : 836; //默认人名币
+
                 #region 添加出访起止时间
                 var startTime = new DateTime();
                 var endTime = new DateTime();
@@ -907,8 +911,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         Officialneeds = dto.Officialneeds,
                         VisitStartDate = startTime,
                         VisitEndDate = endTime,
-                        ExtOverLimit = dto.ExtOverLimit,
-                        ExtOverCurrency = dto.ExtOverCurrency
+                        ExtOverLimit = extOverLimit,
+                        ExtOverCurrency = extOverCurrency
                     };
 
                     var addId = _sqlSugar.Insertable(delegationInfo).ExecuteReturnIdentity();
@@ -960,8 +964,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         Officialneeds = dto.Officialneeds,
                         VisitStartDate = startTime,
                         VisitEndDate = endTime,
-                        ExtOverLimit = dto.ExtOverLimit,
-                        ExtOverCurrency = dto.ExtOverCurrency
+                        ExtOverLimit = extOverLimit,
+                        ExtOverCurrency = extOverCurrency
                     });
 
                     if (updateStatus)