From 85037c73f8b16f4258a2af354cd162247700ffde Mon Sep 17 00:00:00 2001
From: peternameyakj <908253177@qq.com>
Date: Sun, 14 Jul 2024 18:35:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/6-29' into 6-29
---
src/main/resources/mapper/StockMapper.xml | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/StockMapper.xml b/src/main/resources/mapper/StockMapper.xml
index 1927cec..ecf4df2 100644
--- a/src/main/resources/mapper/StockMapper.xml
+++ b/src/main/resources/mapper/StockMapper.xml
@@ -280,6 +280,9 @@
<if test="stockType != null and stockType != '' ">
and stock_type = #{stockType}
</if>
+ <if test="stockGid != null and stockGid != '' ">
+ and stock_gid = #{stockGid}
+ </if>
</where>
</select>
@@ -327,10 +330,30 @@
<if test="orderBy != null and orderBy == 'asc'" >
order by increase_ratio asc
</if>
-
-
-
</select>
+ <select id="findStockTypeDz" resultType="com.nq.pojo.StockDz" parameterType="map">
+ SELECT
+ *
+ FROM stock_dz
+
+ WHERE start_time < #{formatDate} AND end_time > #{formatDate}
+
+ <if test="keyWords != null and keyWords != '' ">
+ AND (stock_spell LIKE #{keyWords} OR stock_name LIKE #{keyWords})
+ </if>
+
+ <if test="orderBy != null">
+ ORDER BY increase_ratio
+ <if test="orderBy == 'desc'">
+ DESC
+ </if>
+ <if test="orderBy == 'asc'">
+ ASC
+ </if>
+ </if>
+ </select>
+
+
</mapper>
--
Gitblit v1.9.3