From a31a8aa4d7df07ce788591e0859dba95775a8105 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 11 Mar 2025 06:49:04 +0800
Subject: [PATCH] md

---
 .../mapper/EmisCreditSalesmenMapper.xml       | 27 ++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisCreditSalesmenMapper.xml b/emis-biz/src/main/resources/mapper/EmisCreditSalesmenMapper.xml
index 3d29e7981..36c7247ea 100644
--- a/emis-biz/src/main/resources/mapper/EmisCreditSalesmenMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCreditSalesmenMapper.xml
@@ -23,8 +23,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectEmisCreditSalesmenList" parameterType="EmisCreditSalesmen" resultMap="EmisCreditSalesmenResult">
-        <include refid="selectEmisCreditSalesmenVo"/>
-        <where>  
+        select id, salesmen, cur_money, cur_money_rate, credit_money, currency, trans_type, start_date, end_date, bl_open, bl_lock, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        from emis_credit_salesmen a
+        <where>
              del_flag='0'
             <if test="id != null "> and id = #{id}</if>
             <if test="salesmen != null  and salesmen != ''"> and salesmen like concat('%', #{salesmen}, '%')</if>
@@ -46,6 +47,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null "> and update_time = #{updateTime}</if>
             <if test="createSite != null  and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
             <if test="updateSite != null  and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
+
+
+            <if test="params.beginCurMoney != null and params.beginCurMoney != ''">
+                and a.curMoney <![CDATA[ >= ]]>  #{params.beginCurMoney}
+            </if>
+            <if test="params.endCurMoney != null and params.endCurMoney != ''">
+                and a.curMoney <![CDATA[ <= ]]>  #{params.endCurMoney}
+            </if>
+
+            <if test="params.beginCurMoneyRate != null and params.beginCurMoneyRate != ''">
+                and a.cur_money_rate <![CDATA[ >= ]]>  #{params.beginCurMoneyRate}
+            </if>
+            <if test="params.endCurMoneyRate != null and params.endCurMoneyRate != ''">
+                and a.cur_money_rate <![CDATA[ <= ]]>  #{params.endCurMoneyRate}
+            </if>
+
         </where>
         order by create_time desc
     </select>
@@ -85,7 +102,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertEmisCreditSalesmen" parameterType="EmisCreditSalesmen" useGeneratedKeys="true" keyProperty="id">
         insert into emis_credit_salesmen
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
             <if test="salesmen != null and salesmen != ''">salesmen,</if>
             <if test="curMoney != null">cur_money,</if>
             <if test="curMoneyRate != null">cur_money_rate,</if>
@@ -107,7 +123,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateSite != null and updateSite != ''">update_site,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
             <if test="salesmen != null and salesmen != ''">#{salesmen},</if>
             <if test="curMoney != null">#{curMoney},</if>
             <if test="curMoneyRate != null">#{curMoneyRate},</if>
@@ -157,11 +172,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteEmisCreditSalesmenById" parameterType="Long">
-        delete from emis_credit_salesmen where id = #{id}
+        update emis_credit_salesmen set del_flag='1' where id = #{id}
     </delete>
 
     <delete id="deleteEmisCreditSalesmenByIds" parameterType="String">
-        delete from emis_credit_salesmen where id in 
+        update emis_credit_salesmen set del_flag='1' where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>