From 06bcdd67a10a70d54064fd7bce834d4e71ec55fe Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 07 Jan 2026 17:17:24 +0800
Subject: [PATCH] 1

---
 src/main/resources/mapper/StockMapper.xml |   32 ++++++++++++++++++++++++++++----
 1 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/StockMapper.xml b/src/main/resources/mapper/StockMapper.xml
index 1927cec..6f3ddab 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>
@@ -279,6 +280,9 @@
       </if>
       <if test="stockType != null and stockType != '' ">
         and stock_type = #{stockType}
+      </if>
+      <if test="stockGid != null and stockGid != '' ">
+        and stock_gid = #{stockGid}
       </if>
     </where>
   </select>
@@ -316,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>
@@ -327,10 +331,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 &lt; #{formatDate} AND end_time &gt; #{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