机票报表下载更改

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -3009,8 +3009,6 @@ namespace OASystem.API.Controllers
                         item.PriceDt = dtTemp_PriceDt.ToString("yyyy-MM-dd");
                     }
 
-
-
                     //费用类型
                     if (dic_setData.ContainsKey(item.PriceType))
                     {

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -2136,7 +2136,11 @@ namespace OASystem.API.Controllers
                             }
                             else
                             {
-                                item.BankNo = item.BankType + ":" + item.BankNo?.Substring(0, 3);
+                                if (!string.IsNullOrEmpty(item.BankType))
+                                {
+                                    item.BankNo = item.BankType + ":" + item.BankNo?.Substring(0, 3);
+                                }
+                                
                             }
                             item.PrePrice = System.Decimal.Round(item.PrePrice, 2);
                             item.Price = System.Decimal.Round(item.Price, 2);
@@ -2163,11 +2167,14 @@ namespace OASystem.API.Controllers
             }
             catch (Exception ex)
             {
-                return Ok(JsonView(false, "程序错误！"));
+                return Ok(JsonView(false, ex.Message));
                 throw;
             }
         }
+        
+        
         Dictionary<string, string> transDic = new Dictionary<string, string>();
+
         /// <summary>
         /// 行程单导出
         /// </summary>
@@ -2892,8 +2899,6 @@ namespace OASystem.API.Controllers
             }
         }
 
-
-
         #endregion
 
         #region 文件上传、删除

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

@@ -138,19 +138,86 @@ namespace OASystem.Infrastructure.Repositories.Groups
         { 
             Result result = new Result() { Code =-1,Msg="操作失败!" };
 
+            #region MyRegion
+            //var enterExitCost = _mapper.Map<Grp_EnterExitCost>(dto);
+            ////enterExitCost.InsidePay = enterExitCost.Visa + enterExitCost.YiMiao + enterExitCost.HeSuan + enterExitCost.Service + enterExitCost.Safe + enterExitCost.Ticket;
+            //var quarterageData = _mapper.Map<List<Grp_DayAndCost>>(dto.QuarterageData);  //住宿费 1
+            //quarterageData = quarterageData.Select(it => { it.CreateUserId = dto.UserId; return it; }).ToList();
+
+            //var boardWagesData = _mapper.Map<List<Grp_DayAndCost>>(dto.BoardWagesData);  //伙食费 2
+            //boardWagesData = boardWagesData.Select(it => { it.CreateUserId = dto.UserId; return it; }).ToList();
+
+            //var miscellaneousFeeData = _mapper.Map<List<Grp_DayAndCost>>(dto.MiscellaneousFeeData);  //公杂费 3
+            //miscellaneousFeeData = miscellaneousFeeData.Select(it => { it.CreateUserId = dto.UserId; return it; }).ToList();
+
+            //var trainingExpenseData = _mapper.Map<List<Grp_DayAndCost>>(dto.TrainingExpenseData);    //培训费 4
+            //trainingExpenseData = trainingExpenseData.Select(it => { it.CreateUserId = dto.UserId; return it; }).ToList();
+
+
+            ////处理币种string
+            //enterExitCost.CurrencyRemark = CommonFun.GetCurrencyChinaToString(dto.Currencys);
+            //enterExitCost.CreateUserId = dto.UserId;
+
+            //_sqlSugar.BeginTran();
+
+            //if (dto.PortType == 1)
+            //{
+            //    try
+            //    {
+            //        var enterExit = _sqlSugar.Storageable<Grp_EnterExitCost>(enterExitCost).ToStorage();
+
+            //        var enterExitadd = enterExit.AsInsertable.ExecuteCommand();   //不存在插入
+            //        var enterExitedit = enterExit.AsUpdateable.IgnoreColumns(it => new { it.DiId, it.CreateUserId, it.CreateTime, it.IsDel }).ExecuteCommand();   //存在更新
+
+            //        var quarterage = _sqlSugar.Storageable<Grp_DayAndCost>(quarterageData).ToStorage();  //住宿费 1
+            //        var quarterageadd = quarterage.AsInsertable.ExecuteCommand();   //不存在插入                             
+            //        var quarterageedit = quarterage.AsUpdateable.IgnoreColumns(it => new { it.DiId, it.Type, it.CreateUserId, it.CreateTime, it.IsDel }).ExecuteCommand();   //存在更新
+
+            //        var boardWages = _sqlSugar.Storageable<Grp_DayAndCost>(boardWagesData).ToStorage();  //伙食费 2
+            //        var boardWagesadd = boardWages.AsInsertable.ExecuteCommand();   //不存在插入
+            //        var boardWagesedit = boardWages.AsUpdateable.IgnoreColumns(it => new { it.DiId, it.Type, it.CreateUserId, it.CreateTime, it.IsDel }).ExecuteCommand();   //存在更新
+
+            //        var miscellaneousFee = _sqlSugar.Storageable<Grp_DayAndCost>(miscellaneousFeeData).ToStorage(); //公杂费 3
+            //        var miscellaneousFeeedd = miscellaneousFee.AsInsertable.ExecuteCommand();   //不存在插入
+            //        var miscellaneousFeeedit = miscellaneousFee.AsUpdateable.IgnoreColumns(it => new { it.DiId, it.Type, it.CreateUserId, it.CreateTime, it.IsDel }).ExecuteCommand();   //存在更新
+
+            //        var trainingExpense = _sqlSugar.Storageable<Grp_DayAndCost>(trainingExpenseData).ToStorage();    //培训费 4
+            //        var trainingExpenseadd = trainingExpense.AsInsertable.ExecuteCommand();   //不存在插入
+            //        var trainingExpenseedit = trainingExpense.AsUpdateable.IgnoreColumns(it => new { it.DiId, it.Type, it.CreateUserId, it.CreateTime, it.IsDel }).ExecuteCommand();   //存在更新
+
+            //        _sqlSugar.CommitTran();
+            //        result.Code = 0;
+            //        result.Msg = "操作成功!";
+            //    }
+            //    catch (Exception ex)
+            //    {
+            //        _sqlSugar.RollbackTran();
+            //        result.Msg = ex.Message;
+            //    }
+            //}
+            //else result.Msg = ErrorMsg.Error_Port_Msg;
+            #endregion
+
             var enterExitCost = _mapper.Map<Grp_EnterExitCost>(dto);
             //enterExitCost.InsidePay = enterExitCost.Visa + enterExitCost.YiMiao + enterExitCost.HeSuan + enterExitCost.Service + enterExitCost.Safe + enterExitCost.Ticket;
+
+            List<Grp_DayAndCost> subData = new List<Grp_DayAndCost>();
             var quarterageData = _mapper.Map<List<Grp_DayAndCost>>(dto.QuarterageData);  //住宿费 1
             quarterageData = quarterageData.Select(it => { it.CreateUserId = dto.UserId; return it; }).ToList();
+            if (quarterageData.Count > 0) subData.AddRange(quarterageData);
 
             var boardWagesData = _mapper.Map<List<Grp_DayAndCost>>(dto.BoardWagesData);  //伙食费 2
             boardWagesData = boardWagesData.Select(it => { it.CreateUserId = dto.UserId; return it; }).ToList();
+            if (boardWagesData.Count > 0) subData.AddRange(boardWagesData);
 
             var miscellaneousFeeData = _mapper.Map<List<Grp_DayAndCost>>(dto.MiscellaneousFeeData);  //公杂费 3
             miscellaneousFeeData = miscellaneousFeeData.Select(it => { it.CreateUserId = dto.UserId; return it; }).ToList();
+            if (miscellaneousFeeData.Count > 0) subData.AddRange(miscellaneousFeeData);
 
             var trainingExpenseData = _mapper.Map<List<Grp_DayAndCost>>(dto.TrainingExpenseData);    //培训费 4
             trainingExpenseData = trainingExpenseData.Select(it => { it.CreateUserId = dto.UserId; return it; }).ToList();
+            if (trainingExpenseData.Count > 0) subData.AddRange(trainingExpenseData);
+
 
 
             //处理币种string
@@ -163,30 +230,67 @@ namespace OASystem.Infrastructure.Repositories.Groups
             {
                 try
                 {
-                    var enterExit = _sqlSugar.Storageable<Grp_EnterExitCost>(enterExitCost).ToStorage();
-                    
-                    var enterExitadd = enterExit.AsInsertable.ExecuteCommand();   //不存在插入
-                    var enterExitedit = enterExit.AsUpdateable.IgnoreColumns(it => new { it.DiId, it.CreateUserId, it.CreateTime, it.IsDel }).ExecuteCommand();   //存在更新
-
-                    var quarterage = _sqlSugar.Storageable<Grp_DayAndCost>(quarterageData).ToStorage();  //住宿费 1
-                    var quarterageadd  =quarterage.AsInsertable.ExecuteCommand();   //不存在插入                             
-                    var quarterageedit = quarterage.AsUpdateable.IgnoreColumns(it => new { it.DiId, it.Type, it.CreateUserId, it.CreateTime, it.IsDel }).ExecuteCommand();   //存在更新
-
-                    var boardWages = _sqlSugar.Storageable<Grp_DayAndCost>(boardWagesData).ToStorage();  //伙食费 2
-                    var boardWagesadd  =boardWages.AsInsertable.ExecuteCommand();   //不存在插入
-                    var boardWagesedit = boardWages.AsUpdateable.IgnoreColumns(it => new { it.DiId, it.Type, it.CreateUserId, it.CreateTime, it.IsDel }).ExecuteCommand();   //存在更新
-
-                    var miscellaneousFee = _sqlSugar.Storageable<Grp_DayAndCost>(miscellaneousFeeData).ToStorage(); //公杂费 3
-                    var miscellaneousFeeedd  =miscellaneousFee.AsInsertable.ExecuteCommand();   //不存在插入
-                    var miscellaneousFeeedit = miscellaneousFee.AsUpdateable.IgnoreColumns(it => new { it.DiId, it.Type, it.CreateUserId, it.CreateTime, it.IsDel }).ExecuteCommand();   //存在更新
+                    int enterExitId = 0;
+                    if (enterExitCost.Id > 0) //修改
+                    {
+                        var updateId = _sqlSugar.Updateable<Grp_EnterExitCost>(enterExitCost)
+                                                .IgnoreColumns(it => new { it.DeleteUserId, it.DeleteTime, it.CreateUserId, it.CreateTime, it.IsDel })
+                                                .ExecuteCommand();
+                        if (updateId > 0)
+                        {
+                            enterExitId = enterExitCost.Id;
+                        }
+                        else
+                        {
+                            _sqlSugar.RollbackTran();
+                            result.Msg = "修改操作失败!";
+                            return result;
+
+                        }
+                    }
+                    else
+                    { //添加
+                        enterExitId = _sqlSugar.Insertable<Grp_EnterExitCost>(enterExitCost).ExecuteReturnIdentity();
+                        if (enterExitId < 1)
+                        {
+                            result.Msg = "添加操作失败!";
+                            return result;
+                        }
+                    }
 
-                    var trainingExpense = _sqlSugar.Storageable<Grp_DayAndCost>(trainingExpenseData).ToStorage();    //培训费 4
-                    var trainingExpenseadd  =trainingExpense.AsInsertable.ExecuteCommand();   //不存在插入
-                    var trainingExpenseedit = trainingExpense.AsUpdateable.IgnoreColumns(it => new { it.DiId, it.Type, it.CreateUserId, it.CreateTime, it.IsDel }).ExecuteCommand();   //存在更新
+                    if (enterExitId > 0)
+                    {
+                        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();
                     result.Code = 0;
                     result.Msg = "操作成功!";
+
                 }
                 catch (Exception ex)
                 {
@@ -196,6 +300,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
             }
             else result.Msg = ErrorMsg.Error_Port_Msg;
 
+
             return result;
         }
 

OASystem/OASystem.Infrastructure/Repositories/Groups/InvitationOfficialActivitiesRepository.cs

@@ -219,7 +219,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
             }
             catch (Exception ex)
             {
-                return result = new Result() { Code = -2, Msg = "未知错误" };
+                return result = new Result() { Code = -2, Msg = ex.Message };
             }
         }