diff --git a/emis-biz/src/main/resources/mapper/EmisCreditSalesmenMapper.xml b/emis-biz/src/main/resources/mapper/EmisCreditSalesmenMapper.xml index 16a0b44a3..880658105 100644 --- a/emis-biz/src/main/resources/mapper/EmisCreditSalesmenMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisCreditSalesmenMapper.xml @@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and NOW() between t.start_date and t.end_date order by t.create_time desc limit 1), 0 - ) - a.use_money) = ]]> #{params.beginCurMoney} + ) - a.use_money + COALESCE(a.satisfy_money, 0)) = ]]> #{params.beginCurMoney} and (COALESCE(a.credit_money, 0) + COALESCE( @@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and NOW() between t.start_date and t.end_date order by t.create_time desc limit 1), 0 - ) - a.use_money) #{params.endCurMoney} + ) - a.use_money + COALESCE(a.satisfy_money, 0)) #{params.endCurMoney} @@ -94,7 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and NOW() between t.start_date and t.end_date order by t.create_time desc limit 1), 0 - ) - a.use_money)/(COALESCE(a.credit_money, 0) + COALESCE( + ) - a.use_money + COALESCE(a.satisfy_money, 0))/(COALESCE(a.credit_money, 0) + COALESCE( (select temp_credit_money_adjust from emis_temp_credit_salesmen t where t.acc_code = a.acc_code @@ -113,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and NOW() between t.start_date and t.end_date order by t.create_time desc limit 1), 0 - ) - a.use_money)/(COALESCE(a.credit_money, 0) + COALESCE( + ) - a.use_money + COALESCE(a.satisfy_money, 0))/(COALESCE(a.credit_money, 0) + COALESCE( (select temp_credit_money_adjust from emis_temp_credit_salesmen t where t.acc_code = a.acc_code