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 |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/mapper/StockMapper.xml b/src/main/resources/mapper/StockMapper.xml
index 88c31d6..ecf4df2 100644
--- a/src/main/resources/mapper/StockMapper.xml
+++ b/src/main/resources/mapper/StockMapper.xml
@@ -333,28 +333,25 @@
   </select>
 
   <select id="findStockTypeDz" resultType="com.nq.pojo.StockDz" parameterType="map">
-    select
+    SELECT
     *
     FROM stock_dz
 
-    where 1=1
+    WHERE start_time &lt; #{formatDate} AND end_time &gt; #{formatDate}
 
     <if test="keyWords != null and keyWords != '' ">
-      and (stock_spell like #{keyWords} or stock_name like #{keyWords})
+      AND (stock_spell LIKE #{keyWords} OR stock_name LIKE #{keyWords})
     </if>
 
     <if test="orderBy != null">
-      order by  increase_ratio
+      ORDER BY  increase_ratio
       <if test="orderBy == 'desc'">
-        desc
+        DESC
       </if>
       <if test="orderBy == 'asc'">
-        asc
+        ASC
       </if>
     </if>
-
-
-
   </select>
 
 

--
Gitblit v1.9.3