Explorar o código

修正机票费用筛选条件并清理无用代码

修正了机票费用类型筛选条件,避免金额或币种为0的数据被包含。注释掉未使用的 groupInfo 变量获取代码,并移除了 EntryAndExitTips 中未使用的 result 变量声明。
Lyyyi hai 2 días
pai
achega
149b0b64be

+ 3 - 3
OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -10923,7 +10923,7 @@ FROM
                 exp.AndIF(_dto.Label != -1, it => it.CTable == _dto.Label);
 
                 // 费用类型为机票时,排除 金额、币种为0 的数据
-                exp.AndIF(_dto.Label == 85, it => it.PayMoney > 0.00M && it.PaymentCurrency > 0);
+                exp.AndIF(_dto.Label == 85, it => it.PayMoney != 0.00M && it.PaymentCurrency != 0);
 
 
                 if (auditStatus == approvedStatus) exp.And(it => approvedAuditIds.Contains(it.IsAuditGM));
@@ -16857,9 +16857,9 @@ FROM
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> GetEnterExitCostCorrelationTips(EnterExitCostInfobyDiIdDto dto)
         {
-            var groupInfo = await _sqlSugar.Queryable<Grp_DelegationInfo>().FirstAsync(it => it.Id == dto.DiId && it.IsDel == 0);
+            // var groupInfo = await _sqlSugar.Queryable<Grp_DelegationInfo>().FirstAsync(it => it.Id == dto.DiId && it.IsDel == 0);
 
-            //默认币种显示
+            // 默认币种显示
             var reteInfos = await GeneralMethod.EnterExitCostLiveRate();
             var visaData = await _visaFeeInfoRep.EnterExitCostVisaTips(dto.DiId);
             var airData = await GeneralMethod.EntryAndExitTips(dto.DiId);

+ 0 - 2
OASystem/OASystem.Api/OAMethodLib/GeneralMethod.cs

@@ -7001,10 +7001,8 @@ AI 必须按顺序执行:
 
             if (airFees.Any())
             {
-
                 var result = new List<EntryAndExitTipsView>();
 
-
                 foreach (var x in airFees)
                 {
                     string tripDesc = "";