修改报批逻辑

OASystem/OASystem.Infrastructure/Repositories/Groups/GroupCostParameterRepository.cs

@@ -62,7 +62,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
             List<dynamic> dynamics = new List<dynamic>();
             try
             {
-                Grp_EnterExitCost eec = _sqlSugar.Queryable<Grp_EnterExitCost>().First(x => x.DiId == diid);
+                Grp_EnterExitCost eec = _sqlSugar.Queryable<Grp_EnterExitCost>().First(x => x.DiId == diid && x.IsDel == 0);
                 if (eec != null)
                 {
                     var AirJJ = new
@@ -79,10 +79,10 @@ namespace OASystem.Infrastructure.Repositories.Groups
                     };
                     dynamics.Add(AirGW);
 
-                    List<Grp_DayAndCost> dac1 = _sqlSugar.Queryable<Grp_DayAndCost>().Where(x => x.DiId == diid && x.Type == 1 && x.NationalTravelFeeId > 0).ToList();  //酒店费用
-                    List<Grp_DayAndCost> dac2 = _sqlSugar.Queryable<Grp_DayAndCost>().Where(x => x.DiId == diid && x.Type == 2 && x.NationalTravelFeeId > 0).ToList(); //餐费用
+                    List<Grp_DayAndCost> dac1 = _sqlSugar.Queryable<Grp_DayAndCost>().Where(x => x.DiId == diid && x.Type == 1 && x.NationalTravelFeeId > 0 && x.IsDel == 0).ToList();  //酒店费用
+                    List<Grp_DayAndCost> dac2 = _sqlSugar.Queryable<Grp_DayAndCost>().Where(x => x.DiId == diid && x.Type == 2 && x.NationalTravelFeeId > 0 && x.IsDel == 0).ToList(); //餐费用
                     List<Grp_DayAndCost> dac3 = (from item in _sqlSugar.Queryable<Grp_DayAndCost>() //公杂费用
-                                                 where item.DiId == diid && item.Type == 3 && item.NationalTravelFeeId > 0
+                                                 where item.DiId == diid && item.Type == 3 && item.NationalTravelFeeId > 0 && item.IsDel == 0
                                                  select item).ToList();
 
                     decimal SumHotel = 0;
@@ -213,11 +213,15 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         AirGWCTotal += Math.Round((eec.InsidePay), 2);
                     }
                     //国际旅费合计选择框
-                    if (eec.ChoiceTwo == 1)
+                    if (eec.SumJJC == 1)
                     {
-                        if (eec.AirJJC_Checked == 1) AirJJCTotal += Math.Round((eec.OutsideJJPay), 2);
-                        if (eec.AirGWC_Checked == 1) AirGWCTotal += Math.Round((eec.OutsaideGWPay), 2);
+                        AirJJCTotal += Math.Round((eec.OutsideJJPay), 2);
                     }
+                    if (eec.SumGWC == 1)
+                    {
+                        AirGWCTotal += Math.Round((eec.OutsaideGWPay), 2);
+                    }
+
                     //住宿费合计选择框
                     if (eec.ChoiceThree == 1)
                     {