From 2818327f844e65e1efc398271b7e4ebf9e8d8364 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 15 Jan 2026 18:44:53 +0800
Subject: [PATCH] 1

---
 src/main/resources/mapper/StockMapper.xml |   29 +++++++++++++++++------------
 1 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/mapper/StockMapper.xml b/src/main/resources/mapper/StockMapper.xml
index 88c31d6..f6838be 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>
@@ -281,7 +282,7 @@
         and stock_type = #{stockType}
       </if>
       <if test="stockGid != null and stockGid != '' ">
-        and stock_gid = #{stockGid}
+        and stock_type = #{stockGid}
       </if>
     </where>
   </select>
@@ -318,8 +319,10 @@
         <include refid="Base_Column_List"/>
          FROM stock
 
-    where stock_type = #{stockType}
-
+    where 1=1 and is_show = 0
+    <if test="stockType != null and stockType != '' ">
+      and stock_type = #{stockType}
+    </if>
     <if test="keyWords != null and keyWords != '' ">
       and (stock_spell like concat('%',#{keyWords},'%')  or stock_name like concat('%',#{keyWords},'%')  )
     </if>
@@ -333,30 +336,32 @@
   </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>
 
+  <select id="findStocksQuery" resultType="com.nq.vo.stock.StockVOQuery">
+    SELECT id,stock_name,stock_code,stock_spell,stock_type FROM stock
+    WHERE stock_spell like concat('%',#{keyWords},'%')  or stock_name like concat('%',#{keyWords},'%')
+       or stock_code like concat('%',#{keyWords},'%')
+  </select>
 
 
 </mapper>

--
Gitblit v1.9.3