三公费用保存时 真删除数据库中对应团组的三公费用明细

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -10862,20 +10862,6 @@ namespace OASystem.API.Controllers
 
 
             _airTicketResRep.ChangeDataBase(DBEnum.OA2023DB);
-            foreach (var item in listOld)
-            {
-                var result = await _grpScheduleRep._sqlSugar.Updateable<Grp_AirTicketReservations>()
-                .SetColumns(it => it.ClientName == item.ClientName)
-                .Where(s => s.Id == item.Id)
-
-                //.UpdateColumns(s => new { s.Duty, s.ExpectBeginDt, s.ExpectEndDt, s.JobContent, s.Remark, s.StepStatus })
-                .ExecuteCommandAsync();
-            }
-
-
-            
-
-
 
             return Ok(JsonView(true, "操作成功！"));
         }

OASystem/OASystem.Infrastructure/Repositories/Groups/EnterExitCostRepository.cs

@@ -17,14 +17,14 @@ namespace OASystem.Infrastructure.Repositories.Groups
     /// <summary>
     /// 出入境费用 仓库
     /// </summary>
-    public class EnterExitCostRepository:BaseRepository<Grp_EnterExitCost, EnterExitCostView>
+    public class EnterExitCostRepository : BaseRepository<Grp_EnterExitCost, EnterExitCostView>
     {
         private readonly IMapper _mapper;
         private readonly SetDataRepository _setDataRep;
 
 
         public EnterExitCostRepository(SqlSugarClient sqlSugar, IMapper mapper, SetDataRepository setDataRep)
-            :base(sqlSugar) 
+            : base(sqlSugar)
         {
             _setDataRep = setDataRep;
             _mapper = mapper;
@@ -42,7 +42,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
 
             foreach (var item in enterExitList)
             {
-                string rateStr = string.Format(@"美元(USD):{0}|日元(JPY):{1}|欧元(EUR):{2}|英镑(GBP):{3}|港币(HKD):{4}", item.RateUSD,item.RateJPY,item.RateEUR,item.RateGBP,item.RateHKD);
+                string rateStr = string.Format(@"美元(USD):{0}|日元(JPY):{1}|欧元(EUR):{2}|英镑(GBP):{3}|港币(HKD):{4}", item.RateUSD, item.RateJPY, item.RateEUR, item.RateGBP, item.RateHKD);
                 item.CurrencyRemark = rateStr;
             }
 
@@ -51,7 +51,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 .UpdateColumns(it => new { it.CurrencyRemark })
                 .ExecuteCommandAsync();
 
-            if (res > 0) 
+            if (res > 0)
             {
                 result.Code = 0;
                 result.Msg = res.ToString();
@@ -61,7 +61,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
             return result;
         }
 
-        
+
         /// <summary>
         /// 查询 根据 Diid 查询
         /// </summary>
@@ -101,22 +101,22 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 }
                 else
                 {
-                //    List<DayAndCostInfoView> views = new List<DayAndCostInfoView>()
-                //    {
-                //            new DayAndCostInfoView {Days=1},
-                //            new DayAndCostInfoView {Days=2},
-                //            new DayAndCostInfoView {Days=3},
-                //            new DayAndCostInfoView {Days=4},
-                //            new DayAndCostInfoView {Days=5},
-                //            new DayAndCostInfoView {Days=6},
-                //            new DayAndCostInfoView {Days=7},
-                //            new DayAndCostInfoView {Days=8},
-                //    };
-                //    enterExitCostInfoView.QuarterageData = views;
-                //    enterExitCostInfoView.BoardWagesData = views;
-                //    enterExitCostInfoView.MiscellaneousFeeData = views;
-                //    enterExitCostInfoView.TrainingExpenseData = views;
-                //    result.Code = 0;
+                    //    List<DayAndCostInfoView> views = new List<DayAndCostInfoView>()
+                    //    {
+                    //            new DayAndCostInfoView {Days=1},
+                    //            new DayAndCostInfoView {Days=2},
+                    //            new DayAndCostInfoView {Days=3},
+                    //            new DayAndCostInfoView {Days=4},
+                    //            new DayAndCostInfoView {Days=5},
+                    //            new DayAndCostInfoView {Days=6},
+                    //            new DayAndCostInfoView {Days=7},
+                    //            new DayAndCostInfoView {Days=8},
+                    //    };
+                    //    enterExitCostInfoView.QuarterageData = views;
+                    //    enterExitCostInfoView.BoardWagesData = views;
+                    //    enterExitCostInfoView.MiscellaneousFeeData = views;
+                    //    enterExitCostInfoView.TrainingExpenseData = views;
+                    //    result.Code = 0;
                     result.Msg = "未查询出数据!!!";
                 }
 
@@ -124,7 +124,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
             }
             else result.Msg = ErrorMsg.Error_Port_Msg;
 
-            
+
 
             return result;
         }
@@ -135,8 +135,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
         /// <param name="dto"></param>
         /// <returns></returns>
         public async Task<Result> PostEnterExitCostOperate(EnterExitCostOperateDto dto)
-        { 
-            Result result = new Result() { Code =-1,Msg="操作失败!" };
+        {
+            Result result = new Result() { Code = -1, Msg = "操作失败!" };
 
             #region MyRegion
             //var enterExitCost = _mapper.Map<Grp_EnterExitCost>(dto);
@@ -260,31 +260,46 @@ namespace OASystem.Infrastructure.Repositories.Groups
 
                     if (enterExitId > 0)
                     {
+
+                        string sqlDelete = string.Format(@" Delete From Grp_DayAndCost Where Diid = {0} ", dto.DiId);
+                        await ExecuteCommandAsync(sqlDelete);
+
                         foreach (var item in subData)
                         {
-                            if (item.Id > 0) //修改
+                            var updateId = _sqlSugar.Insertable<Grp_DayAndCost>(item).ExecuteCommand();
+                            if (updateId < 1)
                             {
-                                var updateId = _sqlSugar.Updateable<Grp_DayAndCost>(item)
-                                                        .IgnoreColumns(it => new { it.DiId, it.Type, it.CreateUserId, it.CreateTime, it.IsDel })
-                                                        .ExecuteCommand();
-                                if (updateId < 1)
-                                {
-                                    _sqlSugar.RollbackTran();
-                                    result.Msg = "修改操作失败!";
-                                    return result;
-                                }
-                            }
-                            else
-                            {  //添加
-                                var updateId = _sqlSugar.Insertable<Grp_DayAndCost>(item).ExecuteCommand();
-                                if (updateId < 1)
-                                {
-                                    _sqlSugar.RollbackTran();
-                                    result.Msg = "添加操作失败!";
-                                    return result;
-                                }
+                                _sqlSugar.RollbackTran();
+                                result.Msg = "添加操作失败!";
+                                return result;
                             }
                         }
+
+                        //foreach (var item in subData)
+                        //{
+                        //    if (item.Id > 0) //修改
+                        //    {
+                        //        var updateId = _sqlSugar.Updateable<Grp_DayAndCost>(item)
+                        //                                .IgnoreColumns(it => new { it.DiId, it.Type, it.CreateUserId, it.CreateTime, it.IsDel })
+                        //                                .ExecuteCommand();
+                        //        if (updateId < 1)
+                        //        {
+                        //            _sqlSugar.RollbackTran();
+                        //            result.Msg = "修改操作失败!";
+                        //            return result;
+                        //        }
+                        //    }
+                        //    else
+                        //    {  //添加
+                        //        var updateId = _sqlSugar.Insertable<Grp_DayAndCost>(item).ExecuteCommand();
+                        //        if (updateId < 1)
+                        //        {
+                        //            _sqlSugar.RollbackTran();
+                        //            result.Msg = "添加操作失败!";
+                        //            return result;
+                        //        }
+                        //    }
+                        //}
                     }
 
                     _sqlSugar.CommitTran();
@@ -321,7 +336,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 DeleteTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff")
             };
 
-            var del = _sqlSugar.Updateable(data).UpdateColumns(it => new { it.IsDel, it.DeleteUserId,it.DeleteTime }).ExecuteCommand();
+            var del = _sqlSugar.Updateable(data).UpdateColumns(it => new { it.IsDel, it.DeleteUserId, it.DeleteTime }).ExecuteCommand();
 
             if (del > 0) result.Code = 0;
             else result.Msg = string.Format("删除失败!");