Jaymr/zszq-trs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
吴方海
2024-06-11 18:36:13 +08:00
parent 06c11a2506
commit 258b05a3c8
6 changed files with 10 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
YLErpDAL/DataBase/EFExtensions/MySqlBulkExtensions.cs
+2 -14
View File
@@ -56,25 +56,13 @@ namespace YLErp.BLL
}
var selcols = string.Join(", ", selProperties.Select(property => $"`{columns[property.Name]}`"));
var tempTable = tableName + Guid.NewGuid().ToString("N").Substring(0, 16);
var sCommand = new StringBuilder();
sCommand.Append("CREATE TEMPORARY TABLE `").Append(tempTable).Append("` SELECT ")
.Append(selcols).Append("FROM `").Append(tableName).AppendLine("` where 1<>1;");
sCommand.Append("INSERT INTO `").Append(tempTable)
.Append("` (").Append(selcols).Append(") VALUES ");
sCommand.Append("INSERT INTO `").Append(tableName)
.Append("` (").Append(selcols).Append(") VALUES ");
DumpInertValues(sCommand, data, selProperties).AppendLine(";");
sCommand.Append("INSERT INTO ").Append(tableName)
.Append("(").Append(selcols).AppendLine(")")
.Append("SELECT ").AppendLine(selcols)
.Append(" FROM ").Append(tempTable).AppendLine(";")
.Append("DROP TABLE ").Append(tempTable).Append(";");
var sql = sCommand.ToString();
System.Diagnostics.Debug.WriteLine("$$$$$$$$$$");
YLErpDAL/Modules/SwapModule/SwapTradeService.cs
+1 -1
View File
@@ -315,7 +315,7 @@ namespace YLErp.Modules.SwapModule
}
TradeExtendJson tradeExtendJson = new TradeExtendJson()
{
FlowBookMode = (int)FlowBookModeEnum.重置,
FlowBookMode = (int)FlowBookModeEnum.先进先出,
FloatingPnlAnnualized = false,
NeedOpenFee = true,
OpenFeeType = 1,
YLErpWeb/Controllers/SwapTrade2Controller.cs
+1 -1
View File
@@ -67,7 +67,7 @@ namespace YLErp.Web.Controllers
};
r.StructureType = "普通债券类收益互换";
r.ExerciseDate = QdpCalendarHelper.GetNonHolidayDefore(r.StartDate.Value.AddDays(14));
tradeExtendJson.FlowBookMode = (int)FlowBookModeEnum.重置;
tradeExtendJson.FlowBookMode = (int)FlowBookModeEnum.先进先出;
r.trade_extend = new trade_extend()
{
ExtendJson = JsonHelper.Serialize(tradeExtendJson)
YLErpWeb/Views/SwapTrade2/TradeEdit.cshtml
+4 -5
View File
@@ -92,7 +92,6 @@
<select v-model="trade.StructureType" v-on:change="changeStructureType" :disabled="trade.id>0">
<option value="普通债券类收益互换">普通债券类收益互换</option>
<option value="普通收益互换">普通收益互换</option>
<option value="多空组合" disabled>多空组合</option>
</select>
</div>
<div class="form-group">
@@ -157,10 +156,10 @@
<div class="form-group">
<label class="formlabel half">流水簿记模式</label>
<select v-model="trade.trade_extend.ExtendObj.FlowBookMode" disabled>
<option value="0">否</option>
@*<option value="1">先进先出</option>*@
<option value="2">加权平均</option>
<option value="3">重置</option>
@* <option value="0">否</option>*@
<option value="1">先进先出</option>
@* <option value="2">加权平均</option>
<option value="3">重置</option>*@
</select>
</div>
<div class="form-group" >
YLErpWeb/wwwroot/Scripts/app/marginRate/marginRateSwapList.js
+1 -1
View File
@@ -152,7 +152,7 @@ const jqgrid1Mgr = (new function () {
name: 'ValueDate', label: '生效日期', index: 'ValueDate', formatter: 'date'
}, {
name: 'InitMarginRate', label: '期初预付金', index: 'InitMarginRate', formatter: percentFormat
}}, {
}, {
name: 'InitMarginRebateRate', label: '期初预付金利率', index: 'InitMarginRebateRate', formatter: percentFormat,
}, {
name: 'AddToMarginRebateRate', label: '追加预付金利率', index: 'AddToMarginRebateRate', formatter: percentFormat,
YLErpWeb/wwwroot/Scripts/app/swaptrade/swapTradeEdit.js
+1 -1
View File
@@ -177,7 +177,7 @@ const vue = new Vue({
methods: {
changeStructureType() {
this.trade.StockEqvNotional = 0;
this.trade.trade_extend.ExtendObj.FlowBookMode = 0;
//this.trade.trade_extend.ExtendObj.FlowBookMode = 0;
},
//变更初始预付金收取方向
changeInitialMargin() {