From 30e592bd0975b41e0b4b4140c4b794c2e1e121de Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Mon, 09 Feb 2026 15:21:44 +0800
Subject: [PATCH] 平仓

---
 src/main/resources/mapper/StockMapper.xml |   20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/mapper/StockMapper.xml b/src/main/resources/mapper/StockMapper.xml
index 88c31d6..e54c75f 100644
--- a/src/main/resources/mapper/StockMapper.xml
+++ b/src/main/resources/mapper/StockMapper.xml
@@ -262,6 +262,7 @@
     <include refid="Base_Column_List" />
     from stock
     <where>
+      1 = 1 and stock_spell not like '%.st%'
       <if test="showState != null  ">
         and is_show = #{showState}
       </if>
@@ -269,7 +270,7 @@
         and is_lock = #{lockState}
       </if>
       <if test="code != null and code != '' ">
-        and stock_code like CONCAT('%','${code}','%')
+        and stock_code like CONCAT('%','${code}','%') or stock_spell like CONCAT('%','${code}','%')
       </if>
       <if test="name != null and name != '' ">
         and stock_name like CONCAT('%','${name}','%')
@@ -319,7 +320,7 @@
          FROM stock
 
     where stock_type = #{stockType}
-
+    and stock_spell not like '%.st%'
     <if test="keyWords != null and keyWords != '' ">
       and (stock_spell like concat('%',#{keyWords},'%')  or stock_name like concat('%',#{keyWords},'%')  )
     </if>
@@ -333,28 +334,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