From bb146de0f32bfbbb516e1c25ff4873986d548673 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Thu, 15 Jan 2026 10:41:21 +0800
Subject: [PATCH] etf

---
 trading-order-service/src/main/resources/mapper/dz/StockDzMapper.xml |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/trading-order-service/src/main/resources/mapper/dz/StockDzMapper.xml b/trading-order-service/src/main/resources/mapper/dz/StockDzMapper.xml
index e8c32b8..07f5950 100644
--- a/trading-order-service/src/main/resources/mapper/dz/StockDzMapper.xml
+++ b/trading-order-service/src/main/resources/mapper/dz/StockDzMapper.xml
@@ -51,7 +51,7 @@
 
     <select id="getDzOrderList" resultType="com.yami.trading.bean.dz.dto.ExchangeApplyOrderDzDto" parameterType="map">
         SELECT
-        t.*,s.stock_name
+        t.*,s.stock_name,s.day_rate,s.period
         FROM t_exchange_apply_order_dz t
         LEFT JOIN t_stock_dz s ON t.dz_id=s.uuid
         WHERE 1=1
@@ -67,7 +67,7 @@
         <if test="userId != null and userId != '' ">
             AND t.party_id = #{userId}
         </if>
-        ORDER BY  t.create_time DESC
+        ORDER BY  t.close_time DESC,t.create_time DESC
     </select>
 
     <select id="getDzCheckList" resultType="com.yami.trading.bean.dz.dto.ExchangeApplyOrderDzDto" parameterType="map">
@@ -87,6 +87,12 @@
         <if test="stockType != null and stockType != '' ">
             AND s.stock_type = #{stockType}
         </if>
+        <if test="userName != null and userName != '' ">
+            AND (
+            u.user_name LIKE CONCAT('%', #{userName}, '%')
+            OR u.user_code LIKE CONCAT('%', #{userName}, '%')
+            )
+        </if>
         <if test="checkedList!=null">
             and u.user_id in
             <foreach collection="checkedList" separator="," index="index" open="(" close=")" item="r">

--
Gitblit v1.9.3