出入境费用

模板调整

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -338,9 +338,9 @@ namespace OASystem.API.Controllers
             try
             {
                 //迁移数据更新团组汇率
-                Result teamRateData1 = await _teamRateRep.GetGroupRateChangeData();
+                //Result teamRateData1 = await _teamRateRep.GetGroupRateChangeData();
 
-                var data = await _teamRateRep.PostGroupTeamRateHot();
+                //var data = await _teamRateRep.PostGroupTeamRateHot();
 
 
                 Stopwatch stopwatch = Stopwatch.StartNew();

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -4034,7 +4034,7 @@ namespace OASystem.API.Controllers
                             builder.Write(GetEnterExitCostExportCity(placeData, dac.NationalTravelFeeId));
                             builder.MoveToCell(0, accommodationStartIndex, 2, 0);
 
-                            string currency = _CurrDatas.Find(it => it.Id == dac.Currency)?.Name ?? "Unknown";
+                            string currency = _CurrDatas.Find(it => it.Id == dac.Currency)?.Remark ?? "Unknown";
                             builder.Write(currency);//币种
                             builder.MoveToCell(0, accommodationStartIndex, 3, 0);
                             builder.Write(dac.Cost.ToString("#0.00"));//标准
@@ -4047,7 +4047,7 @@ namespace OASystem.API.Controllers
                             builder.MoveToCell(0, accommodationStartIndex, 7, 0);
 
                             decimal rate = 0.00M;
-                            rate = rateDatas.Find(it => it.CurrencyCode.Equals(currency))?.Rate ?? 0.00M;
+                            rate = rateDatas.Find(it => it.CurrencyName.Equals(currency))?.Rate ?? 0.00M;
 
                             builder.Write(rate.ToString("#0.0000"));//汇率
                             builder.MoveToCell(0, accommodationStartIndex, 8, 0);
@@ -4088,7 +4088,7 @@ namespace OASystem.API.Controllers
 
                             builder.Write(GetEnterExitCostExportCity(placeData, dac.NationalTravelFeeId));
                             builder.MoveToCell(0, foodandotherStartIndex, 2, 0);
-                            string currency = _CurrDatas.Find(it => it.Id == dac.Currency)?.Name ?? "Unknown";
+                            string currency = _CurrDatas.Find(it => it.Id == dac.Currency)?.Remark ?? "Unknown";
                             builder.Write(currency);//币种
                             builder.MoveToCell(0, foodandotherStartIndex, 3, 0);
                             builder.Write(dac.Cost.ToString("#0.00"));//标准
@@ -4101,7 +4101,7 @@ namespace OASystem.API.Controllers
                             builder.MoveToCell(0, foodandotherStartIndex, 7, 0);
 
                             decimal rate = 0.00M;
-                            rate = rateDatas.Find(it => it.CurrencyCode.Equals(currency))?.Rate ?? 0.00M;
+                            rate = rateDatas.Find(it => it.CurrencyName.Equals(currency))?.Rate ?? 0.00M;
 
                             builder.Write(rate.ToString("#0.0000"));//汇率
 
@@ -4449,7 +4449,7 @@ namespace OASystem.API.Controllers
                             builder.Write(GetEnterExitCostExportCity(placeData, dac.NationalTravelFeeId));//城市
                             builder.MoveToCell(0, accommodationStartIndex, 2, 0);
 
-                            string currency = _CurrDatas.Find(it => it.Id == dac.Currency)?.Name ?? "Unknwon";
+                            string currency = _CurrDatas.Find(it => it.Id == dac.Currency)?.Remark ?? "Unknwon";
                             builder.Write(currency);//币种
                             builder.MoveToCell(0, accommodationStartIndex, 3, 0);
                             builder.Write(dac.Cost.ToString("#0.00"));//标准
@@ -4494,7 +4494,7 @@ namespace OASystem.API.Controllers
                             builder.Write(GetEnterExitCostExportCity(placeData, dac.NationalTravelFeeId));//城市
                             builder.MoveToCell(0, foodandotherStartIndex, 2, 0);
 
-                            string currency = _CurrDatas.Find(it => it.Id == dac.Currency)?.Name ?? "Unknwon";
+                            string currency = _CurrDatas.Find(it => it.Id == dac.Currency)?.Remark ?? "Unknwon";
                             builder.Write(currency);//币种
                             builder.MoveToCell(0, foodandotherStartIndex, 3, 0);
                             builder.Write(dac.Cost.ToString("#0.00"));//标准
@@ -4586,8 +4586,10 @@ namespace OASystem.API.Controllers
                         }
 
                         string strFileName = $"{_DelegationInfo.TeamName}组团人员名单({DateTime.Now.ToString("yyyyMMddHHmmss")}).doc";
-
+                        //C:/Server/File/OA2023/Office/Word/EnterExitCost/File/
+                        //C:\Server\File\OA2023\Office\Word\EnterExitCost\File\
                         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 }));
                     }

OASystem/OASystem.Infrastructure/Repositories/Groups/EnterExitCostRepository.cs

@@ -101,22 +101,23 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 }
                 else
                 {
-                    List<DayAndCostInfoView> views = new List<DayAndCostInfoView>()
-                    {
-                            new DayAndCostInfoView {},
-                            new DayAndCostInfoView {},
-                            new DayAndCostInfoView {},
-                            new DayAndCostInfoView {},
-                            new DayAndCostInfoView {},
-                            new DayAndCostInfoView {},
-                            new DayAndCostInfoView {},
-                            new DayAndCostInfoView {}
-                    };
-
-                    enterExitCostInfoView.QuarterageData = views;
-                    enterExitCostInfoView.BoardWagesData = views;
-                    enterExitCostInfoView.MiscellaneousFeeData = views;
-                    enterExitCostInfoView.TrainingExpenseData = views;
+                //    List<DayAndCostInfoView> views = new List<DayAndCostInfoView>()
+                //    {
+                //            new DayAndCostInfoView {Days=1},
+                //            new DayAndCostInfoView {Days=2},
+                //            new DayAndCostInfoView {Days=3},
+                //            new DayAndCostInfoView {Days=4},
+                //            new DayAndCostInfoView {Days=5},
+                //            new DayAndCostInfoView {Days=6},
+                //            new DayAndCostInfoView {Days=7},
+                //            new DayAndCostInfoView {Days=8},
+                //    };
+
+                //    enterExitCostInfoView.QuarterageData = views;
+                //    enterExitCostInfoView.BoardWagesData = views;
+                //    enterExitCostInfoView.MiscellaneousFeeData = views;
+                //    enterExitCostInfoView.TrainingExpenseData = views;
+                //    result.Code = 0;
                     result.Msg = "未查询出数据!!!";
                 }