酒店预订 --> 下载Voucher --> 表格样式调整

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -10812,7 +10812,7 @@ ORDER by  gctggrc.id DESC
             string strFileName = "HotelStatement/";
             var dele = await _sqlSugar.Queryable<Grp_DelegationInfo>().Where(it => it.IsDel == 0 && it.Id == _dto.DiId).FirstAsync();
             if (dele != null)
-                strFileName += $"{dele.TourCode}_";
+                strFileName += $"{dele?.TeamName ?? ""}_{dele.TourCode}_";
 
             var guestDatas = await _sqlSugar.Queryable<Crm_DeleClient>().Where(it => it.IsDel == 0).ToListAsync();
             for (int i = 0; i < hrDtas.Count; i++)
@@ -10862,19 +10862,15 @@ ORDER by  gctggrc.id DESC
                 }
             }
 
-            strFileName += $"{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}_VOUCHER.docx";
+            strFileName += $"VOUCHER_{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}.docx";
 
             Document doc = new Document();
 
             DocumentBuilder builder = new DocumentBuilder(doc);
             try
             {
-                
-
-
                 builder.MoveToDocumentStart();
 
-
                 foreach (var item in hrDtas)
                 {
                     //标题
@@ -10913,7 +10909,7 @@ ORDER by  gctggrc.id DESC
                     builder.CellFormat.Borders.Top.Color = System.Drawing.Color.Black;
                     //设置边框样式
                     //builder.CellFormat.Borders.Top.LineStyle = Aspose.Words.LineStyle.Double;
-                    builder.CellFormat.Borders.LineStyle = Aspose.Words.LineStyle.None;
+                    builder.CellFormat.Borders.LineStyle = Aspose.Words.LineStyle.Dot;
 
                     //表格
                     #region 第一行
@@ -11238,7 +11234,7 @@ ORDER by  gctggrc.id DESC
                     builder.CellFormat.FitText = true;//单元格内文字设为多行（默认为单行，会影响单元格宽）
                     builder.ParagraphFormat.Alignment = ParagraphAlignment.Left;//对齐 
                     builder.CellFormat.HorizontalMerge = CellMerge.First;
-                    builder.Write($"ROOM AND TAX ONLY\r\nTHIS SERVICE IS PAYABLE BY BEDSONLINE. FOR EXTRA CHARGE TO BE COLLECTED FROM THE GUEST");
+                    builder.Write($"ROOM WITH BREAKFAST AND TAX ONLY\r\nTHIS SERVICE IS PAYABLE BY C-TRIP. FOR EXTRA CHARGE TO BE COLLECTED FROM THE GUEST.");
 
                     builder.InsertCell();
                     builder.CellFormat.PreferredWidth = PreferredWidth.FromPercent(20);//列宽 - 百分比

OASystem/OASystem.Domain/Entities/Groups/Grp_HotelReservations.cs

@@ -45,17 +45,17 @@ namespace OASystem.Domain.Entities.Groups
         /// <summary>
         /// 所在城市
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "nvarchar(100)")]
         public string City { get; set; }
         /// <summary>
         /// 酒店名称
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "nvarchar(100)")]
         public string HotelName { get; set; }
         /// <summary>
         /// 酒店地址
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(225)")]
+        [SugarColumn(IsNullable = true, ColumnDataType = "nvarchar(225)")]
         public string HotelAddress { get; set; }
         /// <summary>
         /// 酒店电话