Browse Source

费用审核Bug修正;原因:op费用费用尾款类型未指定STID=83,查询出多个尾款类型.first();

leiy 8 months ago
parent
commit
5789453e9e

+ 8 - 8
OASystem/OASystem.Infrastructure/Repositories/Groups/FeeAuditRepository.cs

@@ -164,19 +164,22 @@ namespace OASystem.Infrastructure.Repositories.Groups
             else if (feeType == 2)
             {
                 //1.基础数据参数验证
-                var priceType = setData.Where(x => x.Name.Contains("尾款")).Select(x =>x.Id).ToList();
+                var priceType = new List<int>() { 1062 };
+                //var opinfos = _sqlSugar.Queryable<Grp_CarTouristGuideGroundReservations>()
+                //                       .Where(x => x.IsDel == 0 && x.DiId == diId && x.Id == dataId && !priceType.Contains(x.PriceType))
+                //                       .First();
                 var opinfos = _sqlSugar.Queryable<Grp_CarTouristGuideGroundReservations>()
-                                       .Where(x => x.IsDel == 0 && x.DiId == diId && x.Id == dataId && !priceType.Contains(x.PriceType))
+                                       .Where(x => x.IsDel == 0 && x.DiId == diId && x.Id == dataId )
                                        .First();
                 if (opinfos == null)
                 {
-                    _view.Msg = $"OP费用数据未填写";
+                    _view.Msg = $"OP费用费用类型属于“尾款”或者 内容未填写";
                     return _view;
                 }
                 //1.含超时费用/超支费用 手动审核
-                if (opinfos.SelectCheck.Contains("超时") || opinfos.SelectCheck.Contains("超支"))
+                if (opinfos.SelectCheck.Contains("超时") || opinfos.SelectCheck.Contains("超支") || opinfos.SelectCheck.Contains("尾款"))
                 {
-                    _view.Msg = $"OP费用含超时费用,请手动审核";
+                    _view.Msg = @$"OP费用含尾款超支\超时费用,请手动审核";
                     return _view;
                 }
                 //1.参数验证
@@ -329,9 +332,6 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         }
                     }
                 }
-
-
-
             }
             else _view.Msg = $"请传入有效的feeType参数";