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

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -4047,14 +4047,6 @@ namespace OASystem.API.Controllers
                         //文件名
                         string strFileName = _DelegationInfo.TeamName + "出入境费用.docx";
 
-                        //文件流下载
-                        //byte[] bytes = null;
-                        //using (MemoryStream stream = new MemoryStream())
-                        //{
-                        //    doc.Save(stream, Aspose.Words.SaveFormat.Doc);
-                        //    bytes = stream.ToArray();
-                        //}
-
                         doc.Save(AppSettingsHelper.Get("WordBasePath") + "EnterExitCost/File/" + strFileName);
                         string url = AppSettingsHelper.Get("WordBaseUrl") + "Office/Word/EnterExitCost/File/" + strFileName;
                         return Ok(JsonView(true, "成功", new { Url = url }));
@@ -4155,7 +4147,7 @@ namespace OASystem.API.Controllers
                             builder.Write(rate.ToString("#0.0000"));//汇率
                             builder.MoveToCell(0, accommodationStartIndex, 8, 0);
 
-                            decimal rbmPrice = rate * dac.SubTotal;
+                            decimal rbmPrice = dac.SubTotal;
                             builder.Write(rbmPrice.ToString("#0.00"));//折合人民币
                             accommodationStartIndex++;
                             dac1totalPrice += Convert.ToDecimal(rbmPrice.ToString("#0.00"));
@@ -4209,7 +4201,7 @@ namespace OASystem.API.Controllers
                             builder.Write(rate.ToString("#0.0000"));//汇率
 
                             builder.MoveToCell(0, foodandotherStartIndex, 8, 0);
-                            decimal rbmPrice = rate * dac.SubTotal;
+                            decimal rbmPrice = dac.SubTotal;
                             builder.Write(rbmPrice.ToString("#0.00"));//折合人民币
                             foodandotherStartIndex++;
                             dac2totalPrice += Convert.ToDecimal(rbmPrice.ToString("#0.00"));
@@ -4239,7 +4231,7 @@ namespace OASystem.API.Controllers
                         }
 
                         //总计
-                        decimal allPrice = dac1totalPrice + dac2totalPrice + _EnterExitCosts.CityTranffic + _EnterExitCosts.Visa + _EnterExitCosts.Safe + _EnterExitCosts.Ticket;
+                        decimal allPrice = dac1totalPrice + dac2totalPrice + _EnterExitCosts.Visa + _EnterExitCosts.Safe + _EnterExitCosts.Ticket;
                         
                         //国际旅费
 

OASystem/OASystem.Api/Controllers/StatisticsController.cs

@@ -636,7 +636,8 @@ namespace OASystem.API.Controllers
                     {
                         string clientPinYinName = "";
                         decimal unitCost = 0.00M;
-                        unitCost = (item.PayMoney / item.ClientNum).ConvertToDecimal1();
+                        int cNum = item.ClientNum == 0 ? 1 : item.ClientNum;
+                        unitCost = (item.PayMoney / cNum).ConvertToDecimal1();
 
                         Regex r = new Regex("[0-9]");
                         string name1 = item.ClientName;