TRS-ZS-450 每日估值单中各tab字段逻辑调整汇总

2025-05-28 10:29:09 +08:00
parent 84ea6b09fc
commit 4e4cb17dab
11 changed files with 50 additions and 57 deletions
@@ -475,13 +475,16 @@ namespace YLErp.Modules.SwapModule
            var tradeQuery = DbContext.trade.Where(tradePredicate);
            var query = from flow in positionQuery
                        join td in tradeQuery on flow.SwapTradeId equals td.id
+                        join tr in DbContext.trade_contract_r on td.id equals tr.TradeId into tradeContractGroup
+                        from tradeContract in tradeContractGroup.DefaultIfEmpty()
                        select new ClientSwapPositionResponse
                        {
                            FlowEvent = flow,
                            SwapTradeNo = td.TradeNumber,
                            StructureType = td.StructureType,
                            ClientName = td.ClientName,
-                            ClientId = td.ClientId
+                            ClientId = td.ClientId,
+                            ContractCode = tradeContract.ContractCode,
                        };
            if (string.IsNullOrEmpty(req.sidx))
            {