|
@@ -4088,6 +4088,19 @@ FROM
|
|
|
#endregion
|
|
|
|
|
|
_detail.PriceNameContent = _ioa.InviterArea;
|
|
|
+
|
|
|
+ //2025-09-08 商邀费用名称更改:单项费用不等于0,则在名称后面最佳费用类型名称。
|
|
|
+ List<string> priceExpNames = new List<string>();
|
|
|
+ if (_ioa.InviteCost != 0.00M) priceExpNames.Add("邀请费");
|
|
|
+ if (_ioa.SendCost != 0.00M) priceExpNames.Add("快递费");
|
|
|
+ if (_ioa.EventsCost != 0.00M) priceExpNames.Add("公务活动费");
|
|
|
+ if (_ioa.TranslateCost != 0.00M) priceExpNames.Add("公务翻译费");
|
|
|
+
|
|
|
+ if (priceExpNames != null && priceExpNames.Count > 0)
|
|
|
+ {
|
|
|
+ _detail.PriceNameContent += $"({string.Join("、",priceExpNames)})";
|
|
|
+ }
|
|
|
+
|
|
|
_detail.PriceMsgContent = $@"邀请费用:{_ioa.InviteCost:#0.00} {inviteCurrCode}({inviteCurrName})<br/>" +
|
|
|
$@"快递费用:{_ioa.SendCost:#0.00} {sendCurrCode}({sendCurrName})<br/>" +
|
|
|
$@"公务活动费:{_ioa.EventsCost:#0.00} {eventsCurrCode}({eventsCurrName})<br/>" +
|
|
@@ -15573,7 +15586,6 @@ end as 'country'
|
|
|
workbook = new XSSFWorkbook(new FileStream(filePath, FileMode.Open, FileAccess.Read));
|
|
|
}
|
|
|
|
|
|
-
|
|
|
ISheet sheet = workbook.GetSheetAt(0);
|
|
|
var rowStartIndex = 2;
|
|
|
var clounmCount = 10;
|