Sfoglia il codice sorgente

1.出入境费用明细 新增添加验证,团Id作为验证条件;同一个团只能存在一条数据。

leiy 1 anno fa
parent
commit
63e3700779

+ 0 - 1
OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -3717,7 +3717,6 @@ namespace OASystem.API.Controllers
         {
             try
             {
-
                 var data = await _enterExitCostRep.GetEnterExitCostInfoByDiId(dto);
 
                 if (data.Code != 0)

+ 14 - 28
OASystem/OASystem.Infrastructure/Repositories/Groups/EnterExitCostRepository.cs

@@ -257,10 +257,23 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         }
                     }
                     else
-                    { //添加
+                    {
+                        //效重 根据团组Id 
+
+                        var info  = _sqlSugar.Queryable<Grp_EnterExitCost>().Where(it => it.IsDel == 0 && it.DiId == dto.DiId).First();
+                        if (info != null )
+                        {
+                            _sqlSugar.RollbackTran();
+                            result.Msg = "该团组相关数据已存在,请勿重新添加!";
+                            return result;
+
+                        }
+
+                        //添加
                         enterExitId = _sqlSugar.Insertable<Grp_EnterExitCost>(enterExitCost).ExecuteReturnIdentity();
                         if (enterExitId < 1)
                         {
+                            _sqlSugar.RollbackTran();
                             result.Msg = "添加操作失败!";
                             return result;
                         }
@@ -268,7 +281,6 @@ namespace OASystem.Infrastructure.Repositories.Groups
 
                     if (enterExitId > 0)
                     {
-
                         string sqlDelete = string.Format(@" Delete From Grp_DayAndCost Where Diid = {0} ", dto.DiId);
                         await ExecuteCommandAsync(sqlDelete);
 
@@ -282,32 +294,6 @@ namespace OASystem.Infrastructure.Repositories.Groups
                                 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();