diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCreditSalesmen.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCreditSalesmen.java index 974775c5c..924938522 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCreditSalesmen.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCreditSalesmen.java @@ -57,7 +57,6 @@ public class EmisCreditSalesmen extends BaseEntity private Date endDate; /* 是否启用 1-启用 0-未启用 */ private String blOpen; - /* 是否锁定 0-否 1-是 */ - private String blLock; + } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index 910ceef21..00f46ca53 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -269,6 +269,7 @@ public class EmisBaseService { queryCreditSalesmen.setSalesmen(emisWaybill.getSalesmen()); queryCreditSalesmen.getParams().put("sendDate",emisWaybill.getSendDate()); queryCreditSalesmen.setTransType(emisWaybill.getTransType()); + queryCreditSalesmen.setBlOpen("1"); List listCreditSalesmen=emisCreditSalesmenMapper.selectEmisCreditSalesmenList(queryCreditSalesmen); if(!CollectionUtils.isEmpty(listCreditSalesmen)){ diff --git a/emis-biz/src/main/resources/mapper/EmisCreditCustomerMapper.xml b/emis-biz/src/main/resources/mapper/EmisCreditCustomerMapper.xml index 122ebe045..8f5a71749 100644 --- a/emis-biz/src/main/resources/mapper/EmisCreditCustomerMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisCreditCustomerMapper.xml @@ -45,14 +45,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.cur_money = #{curMoney} and a.cur_money_rate = #{curMoneyRate} and a.credit_money = #{creditMoney} - and a.currency like concat('%', #{currency}, '%') - and FIND_IN_SET(#{params.transType},a.trans_type) + and a.currency=#{currency} + and FIND_IN_SET(#{transType},a.trans_type) and a.start_date = #{startDate} and a.end_date = #{endDate} - and a.bl_open like concat('%', #{blOpen}, '%') + and a.bl_open=#{blOpen} and a.remark like concat('%', #{remark}, '%') and a.tenant_id like concat('%', #{tenantId}, '%') - and a.del_flag like concat('%', #{delFlag}, '%') + and a.del_flag=#{delFlag} and a.create_by like concat('%', #{createBy}, '%') and a.create_time = #{createTime} and a.update_by like concat('%', #{updateBy}, '%') diff --git a/emis-biz/src/main/resources/mapper/EmisCreditSalesmenMapper.xml b/emis-biz/src/main/resources/mapper/EmisCreditSalesmenMapper.xml index daf922c2c..4aa4fbaf2 100644 --- a/emis-biz/src/main/resources/mapper/EmisCreditSalesmenMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisCreditSalesmenMapper.xml @@ -16,7 +16,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - @@ -34,15 +33,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and cur_money = #{curMoney} and cur_money_rate = #{curMoneyRate} and credit_money = #{creditMoney} - and currency like concat('%', #{currency}, '%') - and trans_type like concat('%', #{transType}, '%') + and currency=#{currency} + and FIND_IN_SET(#{transType},a.trans_type) and start_date = #{startDate} and end_date = #{endDate} - and bl_open like concat('%', #{blOpen}, '%') - and bl_lock like concat('%', #{blLock}, '%') + and bl_open=#{blOpen} and remark like concat('%', #{remark}, '%') and tenant_id like concat('%', #{tenantId}, '%') - and del_flag like concat('%', #{delFlag}, '%') + and del_flag =#{delFlag} and create_by like concat('%', #{createBy}, '%') and create_time = #{createTime} and update_by like concat('%', #{updateBy}, '%') @@ -86,7 +84,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and start_date = #{startDate} and end_date = #{endDate} and bl_open = #{blOpen} - and bl_lock = #{blLock} and remark = #{remark} and tenant_id = #{tenantId} and del_flag = #{delFlag} @@ -118,7 +115,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" start_date, end_date, bl_open, - bl_lock, remark, tenant_id, del_flag, @@ -140,7 +136,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{startDate}, #{endDate}, #{blOpen}, - #{blLock}, #{remark}, #{tenantId}, #{delFlag}, @@ -166,7 +161,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" start_date = #{startDate}, end_date = #{endDate}, bl_open = #{blOpen}, - bl_lock = #{blLock}, remark = #{remark}, tenant_id = #{tenantId}, del_flag = #{delFlag},