From 2b645affc1549e50d55d127ea772991384a2c196 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 11 Mar 2025 22:38:22 +0800
Subject: [PATCH] md

---
 .../mapper/EmisCreditCustomerMapper.xml        |  8 ++++----
 .../mapper/EmisCreditSalesmenMapper.xml        | 18 ++++++++++--------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisCreditCustomerMapper.xml b/emis-biz/src/main/resources/mapper/EmisCreditCustomerMapper.xml
index 8f5a71749..8ceed860c 100644
--- a/emis-biz/src/main/resources/mapper/EmisCreditCustomerMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCreditCustomerMapper.xml
@@ -61,17 +61,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateSite != null  and updateSite != ''"> and a.update_site like concat('%', #{updateSite}, '%')</if>
 
             <if test="params.beginCurMoney != null and params.beginCurMoney != ''">
-                and a.curMoney <![CDATA[ >= ]]>  #{params.beginCurMoney}
+                and a.cur_money <![CDATA[ >= ]]>  #{params.beginCurMoney}
             </if>
             <if test="params.endCurMoney != null and params.endCurMoney != ''">
-                and a.curMoney <![CDATA[ <= ]]>  #{params.endCurMoney}
+                and a.cur_money <![CDATA[ <= ]]>  #{params.endCurMoney}
             </if>
 
             <if test="params.beginCurMoneyRate != null and params.beginCurMoneyRate != ''">
-                and a.cur_money_rate <![CDATA[ >= ]]>  #{params.beginCurMoneyRate}
+                and (a.cur_money/a.credit_money) <![CDATA[ >= ]]>  #{params.beginCurMoneyRate}
             </if>
             <if test="params.endCurMoneyRate != null and params.endCurMoneyRate != ''">
-                and a.cur_money_rate <![CDATA[ <= ]]>  #{params.endCurMoneyRate}
+                and (a.cur_money/a.credit_money) <![CDATA[ <= ]]>  #{params.endCurMoneyRate}
             </if>
 
             <if test="params.sendDate != null ">
diff --git a/emis-biz/src/main/resources/mapper/EmisCreditSalesmenMapper.xml b/emis-biz/src/main/resources/mapper/EmisCreditSalesmenMapper.xml
index 6aa8b629d..990119ead 100644
--- a/emis-biz/src/main/resources/mapper/EmisCreditSalesmenMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCreditSalesmenMapper.xml
@@ -50,22 +50,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
             <if test="params.beginCurMoney != null and params.beginCurMoney != ''">
-                and a.curMoney <![CDATA[ >= ]]>  #{params.beginCurMoney}
+                and a.cur_money <![CDATA[ >= ]]>  #{params.beginCurMoney}
             </if>
             <if test="params.endCurMoney != null and params.endCurMoney != ''">
-                and a.curMoney <![CDATA[ <= ]]>  #{params.endCurMoney}
+                and a.cur_money <![CDATA[ <= ]]>  #{params.endCurMoney}
+            </if>
+
+            <if test="params.beginCurMoneyRate != null and params.beginCurMoneyRate != ''">
+                and (a.cur_money/a.credit_money) <![CDATA[ >= ]]>  #{params.beginCurMoneyRate}
+            </if>
+            <if test="params.endCurMoneyRate != null and params.endCurMoneyRate != ''">
+                and (a.cur_money/a.credit_money) <![CDATA[ <= ]]>  #{params.endCurMoneyRate}
             </if>
 
             <if test="params.sendDate != null ">
                 and ( a.start_date <![CDATA[ < ]]>  #{params.sendDate} ) and (  #{params.sendDate} <![CDATA[ <= ]]> a.end_date )
             </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