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 | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 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 7fafa96..07f5950 100644
--- a/trading-order-service/src/main/resources/mapper/dz/StockDzMapper.xml
+++ b/trading-order-service/src/main/resources/mapper/dz/StockDzMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.yami.trading.dao.dz.StockDzMapper">
- <select id="findStockTypeDz" resultType="com.yami.trading.bean.dz.StockDz" parameterType="map">
+ <select id="findStockTypeDz" resultType="com.yami.trading.bean.dz.dto.StockDzDto" parameterType="map">
SELECT
*
FROM t_stock_dz
@@ -15,7 +15,10 @@
</if>
<if test="keyWords != null and keyWords != '' ">
- AND (stock_spell LIKE #{keyWords} OR stock_name LIKE #{keyWords})
+ AND (
+ stock_spell LIKE CONCAT('%', #{keyWords}, '%')
+ OR stock_name LIKE CONCAT('%', #{keyWords}, '%')
+ )
</if>
<if test="orderBy != null">
@@ -38,14 +41,17 @@
AND stock_type = #{stockType}
</if>
<if test="keyWords != null and keyWords != '' ">
- AND (stock_code LIKE #{keyWords} OR stock_name LIKE #{keyWords})
+ AND (
+ stock_code LIKE CONCAT('%', #{keyWords}, '%')
+ OR stock_name LIKE CONCAT('%', #{keyWords}, '%')
+ )
</if>
ORDER BY add_time DESC
</select>
- <select id="getDzOrderList" resultType="com.yami.trading.bean.dz.ExchangeApplyOrderDz" parameterType="map">
+ <select id="getDzOrderList" resultType="com.yami.trading.bean.dz.dto.ExchangeApplyOrderDzDto" parameterType="map">
SELECT
- t.*
+ 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
@@ -55,28 +61,46 @@
<if test="state != null and state != ''">
AND t.state = #{state}
</if>
+ <if test="state == null">
+ AND t.state != 'position'
+ </if>
<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">
SELECT
- t.*,u.user_name,u.user_code,s.stock_name
+ t.*,u.user_name,u.user_code,s.stock_name,r.user_name AS 'recomUserName'
FROM t_exchange_apply_order_dz t
LEFT JOIN tz_user u ON t.party_id = u.user_id
LEFT JOIN t_stock_dz s ON s.uuid = t.dz_id
+ LEFT JOIN tz_user r ON u.user_recom = r.user_id
WHERE 1=1
<if test="state != null and state != ''">
AND t.state = #{state}
</if>
<if test="stockCode != null and stockCode != '' ">
- AND t.symbol = #{stockCode}
+ AND t.symbol LIKE CONCAT('%', #{stockCode}, '%')
</if>
<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">
+ #{r}
+ </foreach>
+
+ </if>
+
ORDER BY t.create_time DESC
</select>
--
Gitblit v1.9.3