|  | @@ -257,10 +257,23 @@ namespace OASystem.Infrastructure.Repositories.Groups
 | 
												
													
														
															|  |                          }
 |  |                          }
 | 
												
													
														
															|  |                      }
 |  |                      }
 | 
												
													
														
															|  |                      else
 |  |                      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();
 |  |                          enterExitId = _sqlSugar.Insertable<Grp_EnterExitCost>(enterExitCost).ExecuteReturnIdentity();
 | 
												
													
														
															|  |                          if (enterExitId < 1)
 |  |                          if (enterExitId < 1)
 | 
												
													
														
															|  |                          {
 |  |                          {
 | 
												
													
														
															|  | 
 |  | +                            _sqlSugar.RollbackTran();
 | 
												
													
														
															|  |                              result.Msg = "添加操作失败!";
 |  |                              result.Msg = "添加操作失败!";
 | 
												
													
														
															|  |                              return result;
 |  |                              return result;
 | 
												
													
														
															|  |                          }
 |  |                          }
 | 
												
											
												
													
														
															|  | @@ -268,7 +281,6 @@ namespace OASystem.Infrastructure.Repositories.Groups
 | 
												
													
														
															|  |  
 |  |  
 | 
												
													
														
															|  |                      if (enterExitId > 0)
 |  |                      if (enterExitId > 0)
 | 
												
													
														
															|  |                      {
 |  |                      {
 | 
												
													
														
															|  | -
 |  | 
 | 
												
													
														
															|  |                          string sqlDelete = string.Format(@" Delete From Grp_DayAndCost Where Diid = {0} ", dto.DiId);
 |  |                          string sqlDelete = string.Format(@" Delete From Grp_DayAndCost Where Diid = {0} ", dto.DiId);
 | 
												
													
														
															|  |                          await ExecuteCommandAsync(sqlDelete);
 |  |                          await ExecuteCommandAsync(sqlDelete);
 | 
												
													
														
															|  |  
 |  |  
 | 
												
											
												
													
														
															|  | @@ -282,32 +294,6 @@ namespace OASystem.Infrastructure.Repositories.Groups
 | 
												
													
														
															|  |                                  return result;
 |  |                                  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();
 |  |                      _sqlSugar.CommitTran();
 |