出入境费用明细 PostEnterExitCostDownload

文件下载 格式调整

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -3710,13 +3710,47 @@ namespace OASystem.API.Controllers
                         decimal miscellaneousFeeTotal = _DayAndCosts.Where(it => it.Type == 1).Sum(it => it.SubTotal);  // 公杂费
                         decimal tainFeeTotal = _DayAndCosts.Where(it => it.Type == 4).Sum(it => it.SubTotal);  // 培训费
                         dic.Add("InsidePay", _EnterExitCosts.InsidePay.ToString("#0.00"));
-                        dic.Add("VisaPay", _EnterExitCosts.Visa.ToString("#0.00"));
-                        dic.Add("VisaRemark", _EnterExitCosts.VisaRemark);
-                        dic.Add("SafePay", _EnterExitCosts.Safe.ToString("#0.00"));
-                        dic.Add("YiMiao", _EnterExitCosts.YiMiao.ToString("#0.00"));
-                        dic.Add("HeSuan", _EnterExitCosts.HeSuan.ToString("#0.00"));
-                        dic.Add("ServiceFee", _EnterExitCosts.Service.ToString("#0.00"));
-                        dic.Add("Ticket", _EnterExitCosts.Ticket.ToString("#0.00"));
+
+                        string row1_1 = "";
+                        if (_EnterExitCosts.Visa > 0)
+                        {
+                            row1_1 = $"签证费： {_EnterExitCosts.Visa.ToString("#0.00")} 人民币/人";
+                            if (!string.IsNullOrEmpty(_EnterExitCosts.VisaRemark))
+                            {
+                                row1_1 += $"\t签证费用描述: ： {_EnterExitCosts.VisaRemark} 人民币/人";
+                            }
+                        }
+
+                        string row1_2 = "";
+                        if (_EnterExitCosts.YiMiao > 0)
+                        {
+                            row1_2 += $"疫苗费：{_EnterExitCosts.YiMiao.ToString("#0.00")} 人民币/人";
+                        }
+                        if (_EnterExitCosts.HeSuan > 0)
+                        {
+                            row1_2 += $"核酸检测费：{_EnterExitCosts.HeSuan.ToString("#0.00")} 人民币/人";
+                        }
+                        if (_EnterExitCosts.Service > 0)
+                        {
+                            row1_2 += $"服务费：{_EnterExitCosts.Service.ToString("#0.00")} 人民币/人";
+                        }
+
+                        string row1_3 = "";
+                        if (_EnterExitCosts.Safe > 0)
+                        {
+                            row1_3 += $"保险费：{_EnterExitCosts.Safe.ToString("#0.00")} 人民币/人";
+                        }
+                        if (_EnterExitCosts.Ticket > 0)
+                        {
+                            row1_3 += $"参展门票：{_EnterExitCosts.Ticket.ToString("#0.00")} 人民币/人";
+                        }
+                        string row1 = "";
+                        if (!string.IsNullOrEmpty(row1_1)) row1 += $"{row1_1}\r\n";
+                        if (!string.IsNullOrEmpty(row1_2)) row1 += $"{row1_2}\r\n";
+                        if (!string.IsNullOrEmpty(row1_3)) row1 += $"{row1_3}";
+
+                        dic.Add("Row1Str", row1);
+
                         dic.Add("OutsideJJ", _EnterExitCosts.OutsideJJPay.ToString("#0.00"));
                         dic.Add("OutsaideGW", _EnterExitCosts.OutsaideGWPay.ToString("#0.00"));
                         dic.Add("AirJJ", _EnterExitCosts.AirJJ.ToString("#0.00"));
@@ -3724,7 +3758,7 @@ namespace OASystem.API.Controllers
                         dic.Add("CityTranffic", _EnterExitCosts.CityTranffic.ToString("#0.00"));
                         dic.Add("SubZS", stayFeeTotal.ToString("#0.00"));
                         dic.Add("SubHS", mealsFeeTotal.ToString("#0.00"));
-                        dic.Add("SubGZF", miscellaneousFeeTotal.ToString("#0.00"));
+                        dic.Add("SubGZF", miscellaneousFeeTotal.ToString("F2"));
                         dic.Add("SubPX", tainFeeTotal.ToString("#0.00"));
 
                         decimal subJJC = _EnterExitCosts.InsidePay + stayFeeTotal + mealsFeeTotal + miscellaneousFeeTotal + tainFeeTotal + _EnterExitCosts.OutsideJJPay;
@@ -3748,108 +3782,117 @@ namespace OASystem.API.Controllers
                         Aspose.Words.Tables.Table table1 = allTables[0] as Aspose.Words.Tables.Table;
                         for (int i = 0; i < dac1.Count; i++)
                         {
-                            builder.MoveToCell(0, i + 1, 0, 0);
-                            builder.Write("第" + dac1[i].Days.ToString() + "晚：");
 
-                            builder.MoveToCell(0, i + 1, 1, 0);
-                            builder.Write(dac1[i].Place == null ? "" : dac1[i].Place);
+                            Grp_DayAndCost dac = dac1[i];
+                            if (dac == null) continue;
 
-                            builder.MoveToCell(0, i + 1, 2, 0);
+                            builder.MoveToCell(0, i, 0, 0);
+                            builder.Write("第" + dac.Days.ToString() + "晚：");
+
+                            builder.MoveToCell(0, i, 1, 0);
+                            builder.Write(dac.Place == null ? "" : dac.Place);
+
+                            builder.MoveToCell(0, i, 2, 0);
                             builder.Write("费用标准：");
 
                             string curr = "";
-                            var currData = _CurrDatas.Where(it => it.Id == dac1[i].Currency).FirstOrDefault();
+                            var currData = _CurrDatas.Where(it => it.Id == dac.Currency).FirstOrDefault();
                             if (currData != null)
                             {
                                 curr = currData.Name;
                             }
-                            builder.MoveToCell(0, i + 1, 3, 0);
-                            builder.Write(dac1[i].Cost.ToString("#0.00") + curr);
+                            builder.MoveToCell(0, i, 3, 0);
+                            builder.Write(dac.Cost.ToString("#0.00") + curr);
 
-                            builder.MoveToCell(0, i + 1, 4, 0);
+                            builder.MoveToCell(0, i, 4, 0);
                             builder.Write("费用小计：");
 
-                            builder.MoveToCell(0, i + 1, 5, 0);
-                            builder.Write(dac1[i].SubTotal.ToString("#0.00") + "CNY");
-
-
+                            builder.MoveToCell(0, i, 5, 0);
+                            builder.Write(dac.SubTotal.ToString("#0.00") + "CNY");
                         }
+
                         //删除多余行
-                        while (table1.Rows.Count > dac1.Count + 1)
+                        while (table1.Rows.Count > dac1.Count)
                         {
-                            table1.Rows.RemoveAt(dac1.Count + 1);
+                            table1.Rows.RemoveAt(dac1.Count);
                         }
 
                         Aspose.Words.Tables.Table table2 = allTables[1] as Aspose.Words.Tables.Table;
                         for (int i = 0; i < dac2.Count; i++)
                         {
 
-                            builder.MoveToCell(1, i + 1, 0, 0);
-                            builder.Write("第" + dac2[i].Days.ToString() + "天：");
+                            Grp_DayAndCost dac = dac2[i];
+                            if (dac == null) continue;
 
-                            builder.MoveToCell(1, i + 1, 1, 0);
-                            builder.Write(dac2[i].Place == null ? "" : dac1[i].Place);
+                            builder.MoveToCell(1, i, 0, 0);
+                            builder.Write("第" + dac.Days.ToString() + "天：");
 
-                            builder.MoveToCell(1, i + 1, 2, 0);
+                            builder.MoveToCell(1, i, 1, 0);
+                            builder.Write(dac.Place == null ? "" : dac.Place);
+
+                            builder.MoveToCell(1, i, 2, 0);
                             builder.Write("费用标准：");
 
                             string curr = "";
-                            var currData = _CurrDatas.Where(it => it.Id == dac1[i].Currency).FirstOrDefault();
+                            var currData = _CurrDatas.Where(it => it.Id == dac.Currency).FirstOrDefault();
                             if (currData != null)
                             {
                                 curr = currData.Name;
                             }
-                            builder.MoveToCell(1, i + 1, 3, 0);
-                            builder.Write(dac2[i].Cost.ToString("#0.00") + curr);
+                            builder.MoveToCell(1, i, 3, 0);
+                            builder.Write(dac.Cost.ToString("#0.00") + curr);
 
-                            builder.MoveToCell(1, i + 1, 4, 0);
+                            builder.MoveToCell(1, i, 4, 0);
                             builder.Write("费用小计：");
 
-                            builder.MoveToCell(1, i + 1, 5, 0);
-                            builder.Write(dac2[i].SubTotal.ToString() + "CNY");
+                            builder.MoveToCell(1, i, 5, 0);
+                            builder.Write(dac.SubTotal.ToString("#0.00") + "CNY");
 
                         }
 
                         //删除多余行
-                        while (table2.Rows.Count > dac2.Count + 1)
+                        while (table2.Rows.Count > dac2.Count)
                         {
-                            table2.Rows.RemoveAt(dac2.Count + 1);
+                            table2.Rows.RemoveAt(dac2.Count);
                         }
 
                         Aspose.Words.Tables.Table table3 = allTables[2] as Aspose.Words.Tables.Table;
                         for (int i = 0; i < dac3.Count; i++)
                         {
 
-                            builder.MoveToCell(2, i + 1, 0, 0);
-                            builder.Write("第" + dac3[i].Days.ToString() + "天：");
+                            Grp_DayAndCost dac = dac3[i];
+                            if (dac == null) continue;
+
+                            builder.MoveToCell(2, i, 0, 0);
+                            builder.Write("第" + dac.Days.ToString() + "天：");
 
-                            builder.MoveToCell(2, i + 1, 1, 0);
-                            builder.Write(dac3[i].Place == null ? "" : dac1[i].Place);
+                            builder.MoveToCell(2, i, 1, 0);
+                            builder.Write(dac.Place == null ? "" : dac.Place);
 
-                            builder.MoveToCell(2, i + 1, 2, 0);
+                            builder.MoveToCell(2, i, 2, 0);
                             builder.Write("费用标准：");
 
                             string curr = "";
-                            var currData = _CurrDatas.Where(it => it.Id == dac1[i].Currency).FirstOrDefault();
+                            var currData = _CurrDatas.Where(it => it.Id == dac.Currency).FirstOrDefault();
                             if (currData != null)
                             {
                                 curr = currData.Name;
                             }
-                            builder.MoveToCell(2, i + 1, 3, 0);
-                            builder.Write(dac3[i].Cost.ToString("#0.00") + curr);
+                            builder.MoveToCell(2, i, 3, 0);
+                            builder.Write(dac.Cost.ToString("#0.00") + curr);
 
-                            builder.MoveToCell(2, i + 1, 4, 0);
+                            builder.MoveToCell(2, i, 4, 0);
                             builder.Write("费用小计：");
 
-                            builder.MoveToCell(2, i + 1, 5, 0);
-                            builder.Write(dac3[i].SubTotal.ToString("#0.00") + "CNY");
+                            builder.MoveToCell(2, i, 5, 0);
+                            builder.Write(dac.SubTotal.ToString("#0.00") + "CNY");
 
                         }
 
                         //删除多余行
-                        while (table3.Rows.Count > dac3.Count + 1)
+                        while (table3.Rows.Count > dac3.Count)
                         {
-                            table3.Rows.RemoveAt(dac3.Count + 1);
+                            table3.Rows.RemoveAt(dac3.Count);
                         }
 
                         #endregion

OASystem/OASystem.Api/Program.cs

@@ -165,51 +165,11 @@ if (AppSettingsHelper.Get("UseSwagger").ToBool())
                 }, Scheme = "oauth2", Name = "Bearer", In = ParameterLocation.Header }, new List<string>()
             }
         });
+
     });
 }
 #endregion
 
-#region 添加swagger注释
-//if (AppSettingsHelper.Get("UseSwagger").ToBool())
-//{
-//    builder.Services.AddSwaggerGen(c =>
-//    {
-//        c.SwaggerDoc("v1", new OpenApiInfo
-//        {
-//            Version = "v1",
-//            Title = "文华商旅支付测试接口",
-//            Description = "请先从Auth鉴权=>login获取token进行认证,输入:token进行认证(Bearer)"
-//        });
-//        c.DocumentFilter<SwaggerApi>();
-//        var xmlPath = Path.Combine(basePath, "OASystem.API.xml");
-//        c.IncludeXmlComments(xmlPath, true);
-//        var xmlDomainPath = Path.Combine(basePath, "OASystem.Domain.xml");
-//        c.IncludeXmlComments(xmlDomainPath, true);
-//        c.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme
-//        {
-//            Description = "Value: Bearer {token}",
-//            Name = "Authorization",
-//            In = ParameterLocation.Header,
-//            Type = SecuritySchemeType.ApiKey,
-//            Scheme = "Bearer"
-//        });
-//        c.AddSecurityRequirement(new OpenApiSecurityRequirement()
-//        {
-//          {
-//            new OpenApiSecurityScheme
-//            {
-//              Reference = new OpenApiReference
-//              {
-//                Type = ReferenceType.SecurityScheme,
-//                Id = "Bearer"
-//              },Scheme = "oauth2",Name = "Bearer",In = ParameterLocation.Header,
-//            },new List<string>()
-//          }
-//        });
-//    });
-//}
-#endregion
-
 #region 添加校验
 
 builder.Services.AddTransient<OASystemAuthentication>();
@@ -372,9 +332,8 @@ if (AppSettingsHelper.Get("UseSwagger").ToBool())
         c.DocExpansion(Swashbuckle.AspNetCore.SwaggerUI.DocExpansion.None);
         c.DefaultModelsExpandDepth(-1);
 
-        // 添加搜索功能
-        c.EnableFilter();
-        c.EnableDeepLinking();
+        //c.EnableFilter();// 添加搜索功能
+        //c.EnableDeepLinking(); // 启用深度链接
     });
 }
 #endregion