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

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -6019,7 +6019,6 @@ FROM
 
                             table4Row = dac4.Count;
                             #region 填充word表格内容
-
                             for (int i = 0; i < dac4.Count; i++)
                             {
                                 Grp_DayAndCost dac = dac4[i];
@@ -6054,7 +6053,8 @@ FROM
 
                             #endregion
                         }
-                        else dic.Add("SubPX", $"六、培训费合计:  0    元/人");
+                        //else dic.Add("SubPX", $"六、培训费合计:  0.00    元/人");
+
                         //删除多余行
                         while (table4.Rows.Count > table4Row)
                         {
@@ -6104,7 +6104,8 @@ FROM
 
                             #endregion
                         }
-                        else dic.Add("SubQT", "七、其他费用合计:  0    元/人");
+                        //else dic.Add("SubQT", "七、其他费用合计:  0    元/人");
+
                         //删除多余行
                         while (table5.Rows.Count > table5Row)
                         {
@@ -6118,16 +6119,30 @@ FROM
                                 subGWC = 0.00M,
                                 subTDC = 0.00M;
 
+                        //全部费用总计： 元 / 人（经济舱)  元 / 人（公务舱）  元 / 人（头等舱)
+                        string totalLabel = string.Format("全部费用总计：");
                         //经济舱
-                        if (_EnterExitCosts.SumJJC == 1) subJJC = otherFeeTotal + _EnterExitCosts.OutsideJJPay;
+                        if (_EnterExitCosts.SumJJC == 1)
+                        {
+                            subJJC = otherFeeTotal + _EnterExitCosts.OutsideJJPay;
+                            totalLabel += $"{subJJC.ToString("#0.00")} 元/人（经济舱）";
+                        }
                         //公务舱
-                        if (_EnterExitCosts.SumGWC == 1) subGWC = otherFeeTotal + _EnterExitCosts.OutsideGWPay;
+                        if (_EnterExitCosts.SumGWC == 1) {
+                            subGWC = otherFeeTotal + _EnterExitCosts.OutsideGWPay;
+                            totalLabel += $"{subGWC.ToString("#0.00")} 元/人（公务舱）";
+                        }
                         //头等舱
-                        if (_EnterExitCosts.SumTDC == 1) subTDC = otherFeeTotal + _EnterExitCosts.OutsideTDPay;
-
-                        dic.Add("SubJJC", subJJC.ToString("#0.00"));
-                        dic.Add("SubGWC", subGWC.ToString("#0.00"));
-                        dic.Add("SubTDC", subTDC.ToString("#0.00"));
+                        if (_EnterExitCosts.SumTDC == 1)
+                        {
+                            subTDC = otherFeeTotal + _EnterExitCosts.OutsideTDPay;
+                            totalLabel += $"{subTDC.ToString("#0.00")} 元/人（头等舱)";
+                        }
+                        //TotalLabel
+                        dic.Add("TotalLabel", totalLabel);
+                        //dic.Add("SubJJC", subJJC.ToString("#0.00"));
+                        //dic.Add("SubGWC", subGWC.ToString("#0.00"));
+                        //dic.Add("SubTDC", subTDC.ToString("#0.00"));
 
                         #region 填充word模板书签内容
                         foreach (var key in dic.Keys)