Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -5420,7 +5420,7 @@ FROM
                         decimal mealsFeeTotal = _DayAndCosts.Where(it => it.Type == 2).Sum(it => it.SubTotal);  // 伙食费费
                         decimal miscellaneousFeeTotal = _DayAndCosts.Where(it => it.Type == 3).Sum(it => it.SubTotal);  // 公杂费
                         decimal tainFeeTotal = _DayAndCosts.Where(it => it.Type == 4).Sum(it => it.SubTotal);  // 培训费
-                        decimal otherPriceTotal = dac5.Sum(x => x.SubTotal);
+                        decimal otherPriceTotal = dac5.Sum(x => x.SubTotal); //其他费用
 
                         decimal insidePayTotal = _EnterExitCosts.InsidePay;
 
@@ -5706,7 +5706,7 @@ FROM
 
                             #endregion
                         }
-                        //else dic.Add("SubPX","0.00");
+                        else dic.Add("SubPX", $"六、培训费合计:  0    元/人");
                         //删除多余行
                         while (table4.Rows.Count > table4Row)
                         {
@@ -5714,12 +5714,13 @@ FROM
                         }
 
                         //其他费用
-                        Aspose.Words.Tables.Table table5 = allTables[3] as Aspose.Words.Tables.Table;
+                        Aspose.Words.Tables.Table table5 = allTables[4] as Aspose.Words.Tables.Table;
                         if (_EnterExitCosts.OtherExpenses_Checked == 1)
                         {
-                            dic.Add("SubQT", otherPriceTotal.ToString("#0.00"));
+                            string qtStr = $"七、其他费用合计:  {otherPriceTotal.ToString("#0.00")}    元/人";
+                            dic.Add("titleQi", qtStr);
 
-                            table5Row = table5.Count;
+                            table5Row = dac5.Count;
                             #region 填充word表格内容
 
                             for (int i = 0; i < dac5.Count; i++)
@@ -5727,29 +5728,29 @@ FROM
                                 var dac = dac5[i];
                                 if (dac == null) continue;
 
-                                builder.MoveToCell(3, i, 0, 0);
+                                builder.MoveToCell(4, i, 0, 0);
                                 builder.Write("第" + dac.Index.ToString() + "项：");
 
-                                builder.MoveToCell(3, i, 1, 0);
+                                builder.MoveToCell(4, i, 1, 0);
 
                                 builder.Write(dac.itemName);
 
-                                builder.MoveToCell(3, i, 2, 0);
+                                builder.MoveToCell(4, i, 2, 0);
                                 builder.Write("费用标准：");
 
-                                builder.MoveToCell(3, i, 3, 0);
+                                builder.MoveToCell(4, i, 3, 0);
                                 builder.Write(dac.Cost.ToString("#0.00") + dac.CurrencyStr);
 
-                                builder.MoveToCell(3, i, 4, 0);
+                                builder.MoveToCell(4, i, 4, 0);
                                 builder.Write("费用小计：");
 
-                                builder.MoveToCell(3, i, 5, 0);
+                                builder.MoveToCell(4, i, 5, 0);
                                 builder.Write(dac.SubTotal.ToString("#0.00") + "CNY");
                             }
 
                             #endregion
                         }
-                        else dic.Add("SubQT", "0.00");
+                        else dic.Add("SubQT", "七、其他费用合计:  0    元/人");
                         //删除多余行
                         while (table5.Rows.Count > table5Row)
                         {
@@ -5777,8 +5778,12 @@ FROM
                         #region 填充word模板书签内容
                         foreach (var key in dic.Keys)
                         {
-                            builder.MoveToBookmark(key);
-                            builder.Write(dic[key]);
+                            Bookmark bookmark = doc.Range.Bookmarks[key];
+                            if (bookmark != null)
+                            {
+                                builder.MoveToBookmark(key);
+                                builder.Write(dic[key]);
+                            }
                         }
 
                         #endregion