From 38a92bc8a3eb615ed3a93381e1a24891de45e9f9 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Sun, 07 Jul 2024 14:02:12 +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 dea23bb..88c31d6 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>
 
@@ -329,25 +332,27 @@
     </if>
   </select>
 
-  <select id="findStockTypeDz" resultMap="BaseResultMap" parameterType="map">
+  <select id="findStockTypeDz" resultType="com.nq.pojo.StockDz" parameterType="map">
     select
-    <include refid="Base_Column_List"/>
-    FROM stock
+    *
+    FROM stock_dz
 
-    where stock_type = #{stockType}
+    where 1=1
 
     <if test="keyWords != null and keyWords != '' ">
-      and (stock_spell like concat('%',#{keyWords},'%')  or stock_name like concat('%',#{keyWords},'%')  )
+      and (stock_spell like #{keyWords} or stock_name like #{keyWords})
     </if>
 
-    and  stock_code in(select stock_code from stock_dz)
+    <if test="orderBy != null">
+      order by  increase_ratio
+      <if test="orderBy == 'desc'">
+        desc
+      </if>
+      <if test="orderBy == 'asc'">
+        asc
+      </if>
+    </if>
 
-    <if test="orderBy != null and orderBy == 'desc'" >
-      order by  increase_ratio desc
-    </if>
-    <if test="orderBy != null and orderBy == 'asc'" >
-      order by  increase_ratio asc
-    </if>
 
 
   </select>

--
Gitblit v1.9.3