成本部分api修改

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -3307,10 +3307,11 @@ namespace OASystem.API.Controllers
             try
             {
                 _sqlSugar.BeginTran();
-                isTrue = await _GroupCostRepository.SaveGroupCostList(Grp_groups,dto.Diid); //列表
+                isTrue = await _GroupCostRepository.
+                    SaveGroupCostList(Grp_groups,dto.Diid); //列表
                 isTrue = await _checkBoxs.SaveCheckBoxs(Grp_CheckBoxs,dto.Diid); //选中项
-                isTrue = await _CostTypeHotelNumberRepository.SaveHotelNumber(Grp_HotelNumber,dto.Diid); //酒店房间数量
-                isTrue = await _GroupCostParameterRepository.SaveAsync(Grp_CostParameters, dto.Diid); //系数
+                isTrue = await _CostTypeHotelNumberRepository.SaveHotelNumber(Grp_HotelNumber,dto.Userid,dto.Diid); //酒店房间数量
+                isTrue = await _GroupCostParameterRepository.SaveAsync(Grp_CostParameters , dto.Userid ,dto.Diid); //系数
 
                 _sqlSugar.CommitTran();
                 jw = JsonView(true,"保存成功！",isTrue);

OASystem/OASystem.Infrastructure/Repositories/Groups/CostTypeHotelNumberRepository.cs

@@ -17,20 +17,31 @@ namespace OASystem.Infrastructure.Repositories.Groups
             return Query(x=>x.Diid == diid).ToList();
         }
 
-        public async Task<bool> SaveHotelNumber(List<Grp_CostTypeHotelNumber> List,int Userid)
+        public async Task<bool> DeleteCostTypeHotelNumberByDiid(int diid)
+        {
+            return await SoftDeleteAsync(x => x.Diid == diid);
+        }
+
+
+        public async Task<bool> SaveHotelNumber(List<Grp_CostTypeHotelNumber> List,int Userid,int diid)
         {
-            var AddList = List.Where(x=>x.Id == 0).ToList();
-            var UpdateList = List.Where(x=>x.Id != 0).ToList();
-            BeginTran();
             bool isTrue = false;
-            if (AddList.Count > 0)
+            try
             {
-                AddList.ForEach(x => { x.CreateUserId = Userid; x.CreateTime = DateTime.Now; });
-                isTrue = Adds(AddList) > 0;
+                BeginTran();
+                isTrue = await DeleteCostTypeHotelNumberByDiid(diid);
+                if (List.Count > 0)
+                {
+                    List.ForEach(x => { x.CreateUserId = Userid; x.CreateTime = DateTime.Now; });
+                    isTrue = Adds(List) > 0;
+                }
+
+                CommitTran();
             }
-            if(UpdateList.Count > 0)
+            catch (Exception)
             {
-                isTrue = await _sqlSugar.Updateable<Grp_CostTypeHotelNumber>(UpdateList).ExecuteCommandHasChangeAsync();
+                RollbackTran();
+                isTrue = false;
             }
             return isTrue;
         }

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

@@ -20,21 +20,29 @@ namespace OASystem.Infrastructure.Repositories.Groups
            return Query(x=>x.DiId == diid).ToList();
         }
 
+        public async Task<bool> DeleteGroupCostParameterListByDiid(int diid) 
+        {
+            return await SoftDeleteAsync(x=>x.DiId == diid);
+        }
 
-        public async Task<bool> SaveAsync(List<Grp_GroupCostParameter> List,int UserId)
+        public async Task<bool> SaveAsync(List<Grp_GroupCostParameter> List,int Userid, int diid)
         {
-            var AddList = List.Where(x => x.Id == 0).ToList();
-            var UpdateList = List.Where(x => x.Id != 0).ToList();
-            BeginTran();
             bool isTrue = false;
-            if (AddList.Count > 0)
+            try
             {
-                AddList.ForEach(x => { x.CreateUserId = UserId; x.CreateTime = DateTime.Now; });
-                isTrue = Adds(AddList) > 0;
+                BeginTran();
+                isTrue = await DeleteGroupCostParameterListByDiid(diid);
+                if (List.Count > 0)
+                {
+                    List.ForEach(x => { x.CreateUserId = Userid; x.CreateTime = DateTime.Now; });
+                    isTrue = Adds(List) > 0;
+                }
+                CommitTran();
             }
-            if (UpdateList.Count > 0)
+            catch (Exception ex)
             {
-                isTrue = await _sqlSugar.Updateable<Grp_GroupCostParameter>(UpdateList).ExecuteCommandHasChangeAsync();
+                RollbackTran();
+                isTrue = false;
             }
             return isTrue;
         }