瀏覽代碼

费用审核 --> 已审费用总额 --> 调整

LEIYI 8 月之前
父節點
當前提交
3795a3c9cd
共有 1 個文件被更改,包括 139 次插入50 次删除
  1. 139 50
      OASystem/OASystem.Api/Controllers/GroupsController.cs

+ 139 - 50
OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -2018,6 +2018,12 @@ namespace OASystem.API.Controllers
                     _detail.OverBudget = overBudgetStr;
 
 
+                    /*
+                     * 已审核金额
+                     */
+                    decimal auditFee = 0.00M;
+                    if (entity.IsAuditGM == 1 || entity.IsAuditGM == 3) auditFee = CurrPayStr;
+
                     /*
                      * 费用总计
                      */
@@ -2028,7 +2034,7 @@ namespace OASystem.API.Controllers
                         AmountPayable = entity.PayMoney,
                         ThisPayment = CurrPayStr,
                         BalancePayment = BalanceStr,
-                        AuditedFunds = CurrPayStr
+                        AuditedFunds = auditFee
                     });
 
                     _detail.IsAuditGM = entity.IsAuditGM;
@@ -2051,7 +2057,6 @@ namespace OASystem.API.Controllers
                 {
                     int CNYIndex = nonDuplicat.IndexOf(ccpCurrencyPrice);
                     nonDuplicat.MoveItemAtIndexToFront(CNYIndex);
-
                 }
                 else
                 {
@@ -2088,7 +2093,6 @@ namespace OASystem.API.Controllers
                         //单独处理已审核费用
                         if (item.CurrencyId == 836) //人民币
                         {
-
                             decimal auditedFunds = ccpCurrencyPrices.Sum(it => it.AuditedFunds);
                             auditedFundsStr += string.Format(@"{0}{1} |", auditedFunds.ToString("#0.00"), item.CurrencyName);
                         }
@@ -10825,10 +10829,17 @@ ORDER by  gctggrc.id DESC
                 {
                     string[] guestIdArr = item.GuestName.Split(',');
                     foreach (var guestIdStr in guestIdArr)
-                        if (int.TryParse(guestIdStr, out int guestId)) 
+                        if (int.TryParse(guestIdStr, out int guestId))
                             guestIds.Add(guestId);
                 }
-                else guestNames += item.GuestName;
+                else {
+
+                    //NaN
+                    if (item.GuestName.Contains("NaN"))
+                    {
+                        guestNames += item.GuestName.Replace("NaN", "").Replace(",", "");
+                    }
+                }
 
                 if (guestIds.Count > 0)
                 {
@@ -10856,10 +10867,10 @@ ORDER by  gctggrc.id DESC
                     }
                 }
 
-                if (!string.IsNullOrEmpty(guestNames))
-                {
+                //if (!string.IsNullOrEmpty(guestNames))
+                //{
                     hrDtas[i].GuestName = guestNames;
-                }
+                //}
             }
 
             strFileName += $"VOUCHER_{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}.docx";
@@ -10877,8 +10888,8 @@ ORDER by  gctggrc.id DESC
                     builder.ParagraphFormat.StyleIdentifier = StyleIdentifier.Title;
                     builder.ParagraphFormat.LineSpacing = 1;
                     builder.ParagraphFormat.Style.Font.Name = "微软雅黑";
-                    //builder.ParagraphFormat.Style.Font.Size = 12;
-                    //builder.ParagraphFormat.Style.Font.Bold = true;
+                    builder.ParagraphFormat.Style.Font.Size = 9;
+                    builder.ParagraphFormat.Style.Font.Bold = true;
                     builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;
                     builder.Writeln(@$"ACCOMMODATION  VOUCHER");
 
@@ -10886,29 +10897,15 @@ ORDER by  gctggrc.id DESC
                     builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;
                     builder.ParagraphFormat.LineSpacing = 1;
                     builder.ParagraphFormat.Style.Font.Name = "微软雅黑";
-                    //builder.ParagraphFormat.Style.Font.Size = 12;
-                    //builder.ParagraphFormat.Style.Font.Bold = true;
+                    builder.ParagraphFormat.Style.Font.Size = 9;
+                    builder.ParagraphFormat.Style.Font.Bold = true;
                     builder.Writeln(@$"VOUCHER No:{item.CheckNumber}   DATE: {item.CreateTime.ToString("yyyy-MM-dd")}");
 
-                    //获取Font对象
-                    Aspose.Words.Font font = builder.Font;
-                    //字体大小
-                    font.Size = 8;
-                    //是否粗体
-                    font.Bold = false;
-                    //下划线样式,None为无下划线
-                    font.Underline = Underline.None;
-
-
                     builder.StartTable();
 
-                    //RowFormat rowf = builder.RowFormat;
-                    //rowf.Height = 20;
-
                     // 设置边框颜色
                     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.Dot;
 
                     //表格
@@ -10917,40 +10914,56 @@ ORDER by  gctggrc.id DESC
                     builder.CellFormat.PreferredWidth = PreferredWidth.FromPercent(20);//列宽 - 百分比
                     builder.CellFormat.HorizontalMerge = CellMerge.None;
                     builder.ParagraphFormat.Style.Font.Name = "微软雅黑";
-                    builder.ParagraphFormat.Style.Font.Size = 8;
+                    builder.ParagraphFormat.Style.Font.Size = 7.5;
                     builder.ParagraphFormat.Style.Font.Bold = false;
                     builder.CellFormat.FitText = true;//单元格内文字设为多行(默认为单行,会影响单元格宽)
                     builder.ParagraphFormat.Alignment = ParagraphAlignment.Right;//对齐 
+                    builder.ParagraphFormat.SpaceBefore = 0;    //设置段前间距 0
+                    builder.ParagraphFormat.SpaceAfter = 0;     //设置段后间距 0
+                    builder.ParagraphFormat.LineSpacingRule = LineSpacingRule.Exactly;  //设置行距 固定值
+                    builder.ParagraphFormat.LineSpacing = 11;   //设置固定的行距为11磅
                     builder.Write("TOUR NO:");
 
                     builder.InsertCell();
                     builder.CellFormat.PreferredWidth = PreferredWidth.FromPercent(30);//列宽 - 百分比
                     builder.CellFormat.HorizontalMerge = CellMerge.None;
                     builder.ParagraphFormat.Style.Font.Name = "微软雅黑";
-                    builder.ParagraphFormat.Style.Font.Size = 8;
+                    builder.ParagraphFormat.Style.Font.Size = 7.5;
                     builder.ParagraphFormat.Style.Font.Bold = false;
                     builder.CellFormat.FitText = true;//单元格内文字设为多行(默认为单行,会影响单元格宽)
                     builder.ParagraphFormat.Alignment = ParagraphAlignment.Left;//对齐 
+                    builder.ParagraphFormat.SpaceBefore = 0;    //设置段前间距 0
+                    builder.ParagraphFormat.SpaceAfter = 0;     //设置段后间距 0
+                    builder.ParagraphFormat.LineSpacingRule = LineSpacingRule.Exactly;  //设置行距 固定值
+                    builder.ParagraphFormat.LineSpacing = 11;   //设置固定的行距为11磅
                     builder.Write($"{dele?.TourCode ?? "-"}");
 
                     builder.InsertCell();
                     builder.CellFormat.PreferredWidth = PreferredWidth.FromPercent(20);//列宽 - 百分比
                     builder.CellFormat.HorizontalMerge = CellMerge.None;
                     builder.ParagraphFormat.Style.Font.Name = "微软雅黑";
-                    builder.ParagraphFormat.Style.Font.Size = 8;
+                    builder.ParagraphFormat.Style.Font.Size = 7.5;
                     builder.ParagraphFormat.Style.Font.Bold = false;
                     builder.CellFormat.FitText = true;//单元格内文字设为多行(默认为单行,会影响单元格宽)
                     builder.ParagraphFormat.Alignment = ParagraphAlignment.Right;//对齐 
+                    builder.ParagraphFormat.SpaceBefore = 0;    //设置段前间距 0
+                    builder.ParagraphFormat.SpaceAfter = 0;     //设置段后间距 0
+                    builder.ParagraphFormat.LineSpacingRule = LineSpacingRule.Exactly;  //设置行距 固定值
+                    builder.ParagraphFormat.LineSpacing = 11;   //设置固定的行距为11磅
                     builder.Write($"CITY:");
 
                     builder.InsertCell();
                     builder.CellFormat.PreferredWidth = PreferredWidth.FromPercent(30);//列宽 - 百分比
                     builder.CellFormat.HorizontalMerge = CellMerge.None;
                     builder.ParagraphFormat.Style.Font.Name = "微软雅黑";
-                    builder.ParagraphFormat.Style.Font.Size = 8;
+                    builder.ParagraphFormat.Style.Font.Size = 7.5;
                     builder.ParagraphFormat.Style.Font.Bold = false;
                     builder.CellFormat.FitText = true;//单元格内文字设为多行(默认为单行,会影响单元格宽)
                     builder.ParagraphFormat.Alignment = ParagraphAlignment.Left;//对齐 
+                    builder.ParagraphFormat.SpaceBefore = 0;    //设置段前间距 0
+                    builder.ParagraphFormat.SpaceAfter = 0;     //设置段后间距 0
+                    builder.ParagraphFormat.LineSpacingRule = LineSpacingRule.Exactly;  //设置行距 固定值
+                    builder.ParagraphFormat.LineSpacing = 11;   //设置固定的行距为11磅
                     builder.Write($"{item.City}");
 
                     builder.EndRow();
@@ -10961,19 +10974,27 @@ ORDER by  gctggrc.id DESC
                     builder.CellFormat.PreferredWidth = PreferredWidth.FromPercent(20);//列宽 - 百分比
                     builder.CellFormat.HorizontalMerge = CellMerge.None;
                     builder.ParagraphFormat.Style.Font.Name = "微软雅黑";
-                    builder.ParagraphFormat.Style.Font.Size = 8;
+                    builder.ParagraphFormat.Style.Font.Size = 7.5;
                     builder.ParagraphFormat.Style.Font.Bold = false;
                     builder.CellFormat.FitText = true;//单元格内文字设为多行(默认为单行,会影响单元格宽)
                     builder.ParagraphFormat.Alignment = ParagraphAlignment.Right;//对齐 
+                    builder.ParagraphFormat.SpaceBefore = 0;    //设置段前间距 0
+                    builder.ParagraphFormat.SpaceAfter = 0;     //设置段后间距 0
+                    builder.ParagraphFormat.LineSpacingRule = LineSpacingRule.Exactly;  //设置行距 固定值
+                    builder.ParagraphFormat.LineSpacing = 11;   //设置固定的行距为11磅
                     builder.Write("CONFIRMATION NO:");
 
                     builder.InsertCell();
                     builder.CellFormat.PreferredWidth = PreferredWidth.FromPercent(30);//列宽 - 百分比
                     builder.ParagraphFormat.Style.Font.Name = "微软雅黑";
-                    builder.ParagraphFormat.Style.Font.Size = 8;
+                    builder.ParagraphFormat.Style.Font.Size = 7.5;
                     builder.ParagraphFormat.Style.Font.Bold = false;
                     builder.CellFormat.FitText = true;//单元格内文字设为多行(默认为单行,会影响单元格宽)
                     builder.ParagraphFormat.Alignment = ParagraphAlignment.Left;//对齐
+                    builder.ParagraphFormat.SpaceBefore = 0;    //设置段前间距 0
+                    builder.ParagraphFormat.SpaceAfter = 0;     //设置段后间距 0
+                    builder.ParagraphFormat.LineSpacingRule = LineSpacingRule.Exactly;  //设置行距 固定值
+                    builder.ParagraphFormat.LineSpacing = 11;   //设置固定的行距为11磅
                     builder.CellFormat.VerticalMerge = CellMerge.None;
                     builder.CellFormat.HorizontalMerge = CellMerge.First;
                     builder.Write($"{item.DetermineNo}");
@@ -10993,21 +11014,29 @@ ORDER by  gctggrc.id DESC
                     builder.InsertCell();
                     builder.CellFormat.PreferredWidth = PreferredWidth.FromPercent(20);//列宽 - 百分比
                     builder.ParagraphFormat.Style.Font.Name = "微软雅黑";
-                    builder.ParagraphFormat.Style.Font.Size = 8;
+                    builder.ParagraphFormat.Style.Font.Size = 7.5;
                     builder.ParagraphFormat.Style.Font.Bold = false;
                     builder.CellFormat.HorizontalMerge = CellMerge.None;
                     builder.CellFormat.FitText = true;//单元格内文字设为多行(默认为单行,会影响单元格宽)
                     builder.ParagraphFormat.Alignment = ParagraphAlignment.Right;//对齐 
+                    builder.ParagraphFormat.SpaceBefore = 0;    //设置段前间距 0
+                    builder.ParagraphFormat.SpaceAfter = 0;     //设置段后间距 0
+                    builder.ParagraphFormat.LineSpacingRule = LineSpacingRule.Exactly;  //设置行距 固定值
+                    builder.ParagraphFormat.LineSpacing = 11;   //设置固定的行距为11磅
                     builder.Write($"HOTEL NAME:");
 
                     builder.InsertCell();
                     builder.CellFormat.PreferredWidth = PreferredWidth.FromPercent(30);//列宽 - 百分比
                     builder.ParagraphFormat.Style.Font.Name = "微软雅黑";
-                    builder.ParagraphFormat.Style.Font.Size = 8;
+                    builder.ParagraphFormat.Style.Font.Size = 7.5;
                     builder.ParagraphFormat.Style.Font.Bold = false;
                     builder.CellFormat.HorizontalMerge = CellMerge.None;
                     builder.CellFormat.FitText = true;//单元格内文字设为多行(默认为单行,会影响单元格宽)
                     builder.ParagraphFormat.Alignment = ParagraphAlignment.Left;//对齐 
+                    builder.ParagraphFormat.SpaceBefore = 0;    //设置段前间距 0
+                    builder.ParagraphFormat.SpaceAfter = 0;     //设置段后间距 0
+                    builder.ParagraphFormat.LineSpacingRule = LineSpacingRule.Exactly;  //设置行距 固定值
+                    builder.ParagraphFormat.LineSpacing = 11;   //设置固定的行距为11磅
                     builder.CellFormat.HorizontalMerge = CellMerge.First;
                     builder.Write($"{item.HotelName}");
 
@@ -11025,11 +11054,15 @@ ORDER by  gctggrc.id DESC
                     builder.InsertCell();
                     builder.CellFormat.PreferredWidth = PreferredWidth.FromPercent(20);//列宽 - 百分比
                     builder.ParagraphFormat.Style.Font.Name = "微软雅黑";
-                    builder.ParagraphFormat.Style.Font.Size = 8;
+                    builder.ParagraphFormat.Style.Font.Size = 7.5;
                     builder.ParagraphFormat.Style.Font.Bold = false;
                     builder.CellFormat.HorizontalMerge = CellMerge.None;
                     builder.CellFormat.FitText = true;//单元格内文字设为多行(默认为单行,会影响单元格宽)
                     builder.ParagraphFormat.Alignment = ParagraphAlignment.Right;//对齐 
+                    builder.ParagraphFormat.SpaceBefore = 0;    //设置段前间距 0
+                    builder.ParagraphFormat.SpaceAfter = 0;     //设置段后间距 0
+                    builder.ParagraphFormat.LineSpacingRule = LineSpacingRule.Exactly;  //设置行距 固定值
+                    builder.ParagraphFormat.LineSpacing = 11;   //设置固定的行距为11磅
                     builder.Write($"HOTEL ADDRESS:");
 
 
@@ -11041,6 +11074,10 @@ ORDER by  gctggrc.id DESC
                     builder.CellFormat.HorizontalMerge = CellMerge.None;
                     builder.CellFormat.FitText = true;//单元格内文字设为多行(默认为单行,会影响单元格宽)
                     builder.ParagraphFormat.Alignment = ParagraphAlignment.Left;//对齐 
+                    builder.ParagraphFormat.SpaceBefore = 0;    //设置段前间距 0
+                    builder.ParagraphFormat.SpaceAfter = 0;     //设置段后间距 0
+                    builder.ParagraphFormat.LineSpacingRule = LineSpacingRule.Exactly;  //设置行距 固定值
+                    builder.ParagraphFormat.LineSpacing = 11;   //设置固定的行距为11磅
                     builder.CellFormat.HorizontalMerge = CellMerge.First;
                     builder.Write($"{item.HotelAddress}");
 
@@ -11059,41 +11096,57 @@ ORDER by  gctggrc.id DESC
                     builder.InsertCell();
                     builder.CellFormat.PreferredWidth = PreferredWidth.FromPercent(20);//列宽 - 百分比
                     builder.ParagraphFormat.Style.Font.Name = "微软雅黑";
-                    builder.ParagraphFormat.Style.Font.Size = 8;
+                    builder.ParagraphFormat.Style.Font.Size = 7.5;
                     builder.ParagraphFormat.Style.Font.Bold = false;
                     builder.CellFormat.HorizontalMerge = CellMerge.None;
                     builder.CellFormat.FitText = true;//单元格内文字设为多行(默认为单行,会影响单元格宽)
                     builder.ParagraphFormat.Alignment = ParagraphAlignment.Right;//对齐 
+                    builder.ParagraphFormat.SpaceBefore = 0;    //设置段前间距 0
+                    builder.ParagraphFormat.SpaceAfter = 0;     //设置段后间距 0
+                    builder.ParagraphFormat.LineSpacingRule = LineSpacingRule.Exactly;  //设置行距 固定值
+                    builder.ParagraphFormat.LineSpacing = 11;   //设置固定的行距为11磅
                     builder.Write("TEL:");
 
                     builder.InsertCell();
                     builder.CellFormat.PreferredWidth = PreferredWidth.FromPercent(30);//列宽 - 百分比
                     builder.ParagraphFormat.Style.Font.Name = "微软雅黑";
-                    builder.ParagraphFormat.Style.Font.Size = 8;
+                    builder.ParagraphFormat.Style.Font.Size = 7.5;
                     builder.ParagraphFormat.Style.Font.Bold = false;
                     builder.CellFormat.HorizontalMerge = CellMerge.None;
                     builder.CellFormat.FitText = true;//单元格内文字设为多行(默认为单行,会影响单元格宽)
                     builder.ParagraphFormat.Alignment = ParagraphAlignment.Left;//对齐 
+                    builder.ParagraphFormat.SpaceBefore = 0;    //设置段前间距 0
+                    builder.ParagraphFormat.SpaceAfter = 0;     //设置段后间距 0
+                    builder.ParagraphFormat.LineSpacingRule = LineSpacingRule.Exactly;  //设置行距 固定值
+                    builder.ParagraphFormat.LineSpacing = 11;   //设置固定的行距为11磅
                     builder.Write($"{item.HotelTel}");
 
                     builder.InsertCell();
                     builder.CellFormat.PreferredWidth = PreferredWidth.FromPercent(20);//列宽 - 百分比
                     builder.ParagraphFormat.Style.Font.Name = "微软雅黑";
-                    builder.ParagraphFormat.Style.Font.Size = 8;
+                    builder.ParagraphFormat.Style.Font.Size = 7.5;
                     builder.ParagraphFormat.Style.Font.Bold = false;
                     builder.CellFormat.HorizontalMerge = CellMerge.None;
                     builder.CellFormat.FitText = true;//单元格内文字设为多行(默认为单行,会影响单元格宽)
                     builder.ParagraphFormat.Alignment = ParagraphAlignment.Right;//对齐 
+                    builder.ParagraphFormat.SpaceBefore = 0;    //设置段前间距 0
+                    builder.ParagraphFormat.SpaceAfter = 0;     //设置段后间距 0
+                    builder.ParagraphFormat.LineSpacingRule = LineSpacingRule.Exactly;  //设置行距 固定值
+                    builder.ParagraphFormat.LineSpacing = 11;   //设置固定的行距为11磅
                     builder.Write($"FAX:");
 
                     builder.InsertCell();
                     builder.CellFormat.PreferredWidth = PreferredWidth.FromPercent(30);//列宽 - 百分比
                     builder.ParagraphFormat.Style.Font.Name = "微软雅黑";
-                    builder.ParagraphFormat.Style.Font.Size = 8;
+                    builder.ParagraphFormat.Style.Font.Size = 7.5;
                     builder.ParagraphFormat.Style.Font.Bold = false;
                     builder.CellFormat.HorizontalMerge = CellMerge.None;
                     builder.CellFormat.FitText = true;//单元格内文字设为多行(默认为单行,会影响单元格宽)
                     builder.ParagraphFormat.Alignment = ParagraphAlignment.Left;//对齐 
+                    builder.ParagraphFormat.SpaceBefore = 0;    //设置段前间距 0
+                    builder.ParagraphFormat.SpaceAfter = 0;     //设置段后间距 0
+                    builder.ParagraphFormat.LineSpacingRule = LineSpacingRule.Exactly;  //设置行距 固定值
+                    builder.ParagraphFormat.LineSpacing = 11;   //设置固定的行距为11磅
                     builder.Write($"{item.HotelFax}");
 
                     builder.EndRow();
@@ -11103,21 +11156,29 @@ ORDER by  gctggrc.id DESC
                     builder.InsertCell();
                     builder.CellFormat.PreferredWidth = PreferredWidth.FromPercent(20);//列宽 - 百分比
                     builder.ParagraphFormat.Style.Font.Name = "微软雅黑";
-                    builder.ParagraphFormat.Style.Font.Size = 8;
+                    builder.ParagraphFormat.Style.Font.Size = 7.5;
                     builder.ParagraphFormat.Style.Font.Bold = false;
                     builder.CellFormat.HorizontalMerge = CellMerge.None;
                     builder.CellFormat.FitText = true;//单元格内文字设为多行(默认为单行,会影响单元格宽)
                     builder.ParagraphFormat.Alignment = ParagraphAlignment.Right;//对齐 
+                    builder.ParagraphFormat.SpaceBefore = 0;    //设置段前间距 0
+                    builder.ParagraphFormat.SpaceAfter = 0;     //设置段后间距 0
+                    builder.ParagraphFormat.LineSpacingRule = LineSpacingRule.Exactly;  //设置行距 固定值
+                    builder.ParagraphFormat.LineSpacing = 11;   //设置固定的行距为11磅
                     builder.Write("CHECK IN:");
 
                     builder.InsertCell();
                     builder.CellFormat.PreferredWidth = PreferredWidth.FromPercent(30);//列宽 - 百分比
                     builder.ParagraphFormat.Style.Font.Name = "微软雅黑";
-                    builder.ParagraphFormat.Style.Font.Size = 8;
+                    builder.ParagraphFormat.Style.Font.Size = 7.5;
                     builder.ParagraphFormat.Style.Font.Bold = false;
                     builder.CellFormat.HorizontalMerge = CellMerge.None;
                     builder.CellFormat.FitText = true;//单元格内文字设为多行(默认为单行,会影响单元格宽)
                     builder.ParagraphFormat.Alignment = ParagraphAlignment.Left;//对齐 
+                    builder.ParagraphFormat.SpaceBefore = 0;    //设置段前间距 0
+                    builder.ParagraphFormat.SpaceAfter = 0;     //设置段后间距 0
+                    builder.ParagraphFormat.LineSpacingRule = LineSpacingRule.Exactly;  //设置行距 固定值
+                    builder.ParagraphFormat.LineSpacing = 11;   //设置固定的行距为11磅
                     DateTime dtCheckIn = Convert.ToDateTime(item.CheckInDate);
                     string checkInStr = dtCheckIn.Day + " " + dtCheckIn.ToString("MMMM", CultureInfo.GetCultureInfo("en-US")) + " " + dtCheckIn.Year + " ";
                     builder.Write($"{checkInStr}");
@@ -11125,21 +11186,29 @@ ORDER by  gctggrc.id DESC
                     builder.InsertCell();
                     builder.CellFormat.PreferredWidth = PreferredWidth.FromPercent(20);//列宽 - 百分比
                     builder.ParagraphFormat.Style.Font.Name = "微软雅黑";
-                    builder.ParagraphFormat.Style.Font.Size = 8;
+                    builder.ParagraphFormat.Style.Font.Size = 7.5;
                     builder.ParagraphFormat.Style.Font.Bold = false;
                     builder.CellFormat.HorizontalMerge = CellMerge.None;
                     builder.CellFormat.FitText = true;//单元格内文字设为多行(默认为单行,会影响单元格宽)
                     builder.ParagraphFormat.Alignment = ParagraphAlignment.Right;//对齐 
+                    builder.ParagraphFormat.SpaceBefore = 0;    //设置段前间距 0
+                    builder.ParagraphFormat.SpaceAfter = 0;     //设置段后间距 0
+                    builder.ParagraphFormat.LineSpacingRule = LineSpacingRule.Exactly;  //设置行距 固定值
+                    builder.ParagraphFormat.LineSpacing = 11;   //设置固定的行距为11磅
                     builder.Write($"CHECK OUT:");
 
                     builder.InsertCell();
                     builder.CellFormat.PreferredWidth = PreferredWidth.FromPercent(30);//列宽 - 百分比
                     builder.ParagraphFormat.Style.Font.Name = "微软雅黑";
-                    builder.ParagraphFormat.Style.Font.Size = 8;
+                    builder.ParagraphFormat.Style.Font.Size = 7.5;
                     builder.ParagraphFormat.Style.Font.Bold = false;
                     builder.CellFormat.HorizontalMerge = CellMerge.None;
                     builder.CellFormat.FitText = true;//单元格内文字设为多行(默认为单行,会影响单元格宽)
                     builder.ParagraphFormat.Alignment = ParagraphAlignment.Left;//对齐 
+                    builder.ParagraphFormat.SpaceBefore = 0;    //设置段前间距 0
+                    builder.ParagraphFormat.SpaceAfter = 0;     //设置段后间距 0
+                    builder.ParagraphFormat.LineSpacingRule = LineSpacingRule.Exactly;  //设置行距 固定值
+                    builder.ParagraphFormat.LineSpacing = 11;   //设置固定的行距为11磅
                     DateTime dtCheckOut = Convert.ToDateTime(item.CheckOutDate);
                     string checkOutStr = dtCheckOut.Day + " " + dtCheckOut.ToString("MMMM", CultureInfo.GetCultureInfo("en-US")) + " " + dtCheckOut.Year + " ";
                     builder.Write($"{checkOutStr}");
@@ -11151,11 +11220,15 @@ ORDER by  gctggrc.id DESC
                     builder.InsertCell();
                     builder.CellFormat.PreferredWidth = PreferredWidth.FromPercent(20);//列宽 - 百分比
                     builder.ParagraphFormat.Style.Font.Name = "微软雅黑";
-                    builder.ParagraphFormat.Style.Font.Size = 8;
+                    builder.ParagraphFormat.Style.Font.Size = 7.5;
                     builder.ParagraphFormat.Style.Font.Bold = false;
                     builder.CellFormat.HorizontalMerge = CellMerge.None;
                     builder.CellFormat.FitText = true;//单元格内文字设为多行(默认为单行,会影响单元格宽)
                     builder.ParagraphFormat.Alignment = ParagraphAlignment.Right;//对齐 
+                    builder.ParagraphFormat.SpaceBefore = 0;    //设置段前间距 0
+                    builder.ParagraphFormat.SpaceAfter = 0;     //设置段后间距 0
+                    builder.ParagraphFormat.LineSpacingRule = LineSpacingRule.Exactly;  //设置行距 固定值
+                    builder.ParagraphFormat.LineSpacing = 11;   //设置固定的行距为11磅
                     builder.Write($"GUEST NAME:");
 
                     builder.InsertCell();
@@ -11166,6 +11239,10 @@ ORDER by  gctggrc.id DESC
                     builder.CellFormat.HorizontalMerge = CellMerge.None;
                     builder.CellFormat.FitText = true;//单元格内文字设为多行(默认为单行,会影响单元格宽)
                     builder.ParagraphFormat.Alignment = ParagraphAlignment.Left;//对齐 
+                    builder.ParagraphFormat.SpaceBefore = 0;    //设置段前间距 0
+                    builder.ParagraphFormat.SpaceAfter = 0;     //设置段后间距 0
+                    builder.ParagraphFormat.LineSpacingRule = LineSpacingRule.Exactly;  //设置行距 固定值
+                    builder.ParagraphFormat.LineSpacing = 11;   //设置固定的行距为11磅
                     builder.CellFormat.HorizontalMerge = CellMerge.First;
                     builder.Write($"{item.GuestName}");
 
@@ -11184,22 +11261,30 @@ ORDER by  gctggrc.id DESC
                     builder.InsertCell();
                     builder.CellFormat.PreferredWidth = PreferredWidth.FromPercent(20);//列宽 - 百分比
                     builder.ParagraphFormat.Style.Font.Name = "微软雅黑";
-                    builder.ParagraphFormat.Style.Font.Size = 8;
+                    builder.ParagraphFormat.Style.Font.Size = 7.5;
                     builder.ParagraphFormat.Style.Font.Bold = false;
                     builder.CellFormat.HorizontalMerge = CellMerge.None;
                     builder.CellFormat.FitText = true;//单元格内文字设为多行(默认为单行,会影响单元格宽)
-                    builder.ParagraphFormat.Alignment = ParagraphAlignment.Right;//对齐 
+                    builder.ParagraphFormat.Alignment = ParagraphAlignment.Right;//对齐
+                    builder.ParagraphFormat.SpaceBefore = 0;    //设置段前间距 0
+                    builder.ParagraphFormat.SpaceAfter = 0;     //设置段后间距 0
+                    builder.ParagraphFormat.LineSpacingRule = LineSpacingRule.Exactly;  //设置行距 固定值
+                    builder.ParagraphFormat.LineSpacing = 11;   //设置固定的行距为11磅 
                     builder.Write($"ROOM TYPE:");
 
 
                     builder.InsertCell();
                     builder.CellFormat.PreferredWidth = PreferredWidth.FromPercent(30);//列宽 - 百分比
                     builder.ParagraphFormat.Style.Font.Name = "微软雅黑";
-                    builder.ParagraphFormat.Style.Font.Size = 8;
+                    builder.ParagraphFormat.Style.Font.Size = 7.5;
                     builder.ParagraphFormat.Style.Font.Bold = false;
                     builder.CellFormat.HorizontalMerge = CellMerge.None;
                     builder.CellFormat.FitText = true;//单元格内文字设为多行(默认为单行,会影响单元格宽)
                     builder.ParagraphFormat.Alignment = ParagraphAlignment.Left;//对齐
+                    builder.ParagraphFormat.SpaceBefore = 0;    //设置段前间距 0
+                    builder.ParagraphFormat.SpaceAfter = 0;     //设置段后间距 0
+                    builder.ParagraphFormat.LineSpacingRule = LineSpacingRule.Exactly;  //设置行距 固定值
+                    builder.ParagraphFormat.LineSpacing = 11;   //设置固定的行距为11磅
                     builder.CellFormat.HorizontalMerge = CellMerge.First;
                     builder.Write($"{item.RoomExplanation}");
 
@@ -11217,24 +11302,28 @@ ORDER by  gctggrc.id DESC
                     builder.InsertCell();
                     builder.CellFormat.PreferredWidth = PreferredWidth.FromPercent(20);//列宽 - 百分比
                     builder.ParagraphFormat.Style.Font.Name = "微软雅黑";
-                    builder.ParagraphFormat.Style.Font.Size = 8;
+                    builder.ParagraphFormat.Style.Font.Size = 7.5;
                     builder.ParagraphFormat.Style.Font.Bold = false;
                     builder.CellFormat.HorizontalMerge = CellMerge.None;
                     builder.CellFormat.FitText = true;//单元格内文字设为多行(默认为单行,会影响单元格宽)
                     builder.ParagraphFormat.Alignment = ParagraphAlignment.Right;//对齐 
+                    builder.ParagraphFormat.SpaceBefore = 0;    //设置段前间距 0
+                    builder.ParagraphFormat.SpaceAfter = 0;     //设置段后间距 0
+                    builder.ParagraphFormat.LineSpacingRule = LineSpacingRule.Exactly;  //设置行距 固定值
+                    builder.ParagraphFormat.LineSpacing = 11;   //设置固定的行距为11磅
                     builder.Write($"NOTE:");
 
 
                     builder.InsertCell();
                     builder.CellFormat.PreferredWidth = PreferredWidth.FromPercent(30);//列宽 - 百分比
                     builder.ParagraphFormat.Style.Font.Name = "微软雅黑";
-                    builder.ParagraphFormat.Style.Font.Size = 8;
+                    builder.ParagraphFormat.Style.Font.Size = 7.5;
                     builder.ParagraphFormat.Style.Font.Bold = false;
                     builder.CellFormat.HorizontalMerge = CellMerge.None;
                     builder.CellFormat.FitText = true;//单元格内文字设为多行(默认为单行,会影响单元格宽)
                     builder.ParagraphFormat.Alignment = ParagraphAlignment.Left;//对齐 
                     builder.CellFormat.HorizontalMerge = CellMerge.First;
-                    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.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);//列宽 - 百分比