From 6ed08e7e6a9ecccbb61d5664301da93bbfff67b6 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 28 Jan 2026 14:29:32 +0800
Subject: [PATCH] 1

---
 src/main/resources/mapper/UserStockSubscribeMapper.xml |   52 ++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/UserStockSubscribeMapper.xml b/src/main/resources/mapper/UserStockSubscribeMapper.xml
index 0713607..df5034f 100644
--- a/src/main/resources/mapper/UserStockSubscribeMapper.xml
+++ b/src/main/resources/mapper/UserStockSubscribeMapper.xml
@@ -24,6 +24,7 @@
         <result column="fix_time" property="fixTime" />
         <result column="remarks" property="remarks" />
         <result column="type" property="type" />
+        <result column="db_money" property="dbMoney"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -46,7 +47,8 @@
                 end_time,
                 fix_time,
                 remarks,
-                type
+                type,
+                    db_money
     </sql>
 
     <insert id="insert1" useGeneratedKeys="true" keyColumn="id" keyProperty="id" parameterType="com.nq.pojo.UserStockSubscribe">
@@ -199,9 +201,8 @@
     </update>
 
 
-    <select id="load" resultMap="BaseResultMap">
-        SELECT <include refid="Base_Column_List" />
-        FROM user_stock_subscribe
+    <select id="load" resultType="com.nq.pojo.UserStockSubscribe" parameterType="int">
+        SELECT * FROM user_stock_subscribe
         WHERE id = #{id}
     </select>
 
@@ -211,6 +212,9 @@
         where 1=1
         <if test="keyword != null and keyword != ''">
             and (user_id = #{keyword} or real_name like CONCAT('%',#{keyword},'%') or phone like CONCAT('%',#{keyword},'%'))
+        </if>
+        <if test="agentId != null and agentId != ''">
+            and agent_id = #{agentId}
         </if>
         order by id desc
     </select>
@@ -227,4 +231,44 @@
         WHERE phone = #{phone}  order by id
     </select>
 
+    <select id="getListByParam" resultType="com.nq.vo.subscribe.UserStockSubscribeVo">
+        SELECT id,
+        order_no,
+        user_id,
+        real_name,
+        phone,
+        agent_id,
+        agent_name,
+        new_code,
+        new_name,
+        bond,
+        buy_price,
+        apply_nums,
+        apply_number,
+        status,
+        add_time,
+        submit_time,
+        end_time,
+        fix_time,
+        remarks,
+        u.type,
+        db_money,
+        new_stock_id
+        ,s.stock_type,s.list_date,s.subscription_time
+        FROM user_stock_subscribe u
+        LEFT JOIN stock_subscribe s on s.newlist_id = u.new_stock_id
+        WHERE 1=1 AND s.newlist_id is not null
+            <if test="userId != null">
+                and u.user_id = #{userId}
+            </if>
+            <if test="type != null and type != ''">
+                and u.type = #{type}
+            </if>
+            <if test="status != null">
+                and u.status = #{status}
+            </if>
+        order by u.add_time desc
+    </select>
+
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3