aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2025-03-11 17:03:40 +08:00
parent 21021e5b5a
commit b3aae5bd07
4 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCreditSalesmen.java
View File

@ -57,7 +57,6 @@ public class EmisCreditSalesmen extends BaseEntity
private Date endDate;
/* 是否启用 1-启用 0-未启用 */
private String blOpen;
/* 是否锁定 0-否 1-是 */
private String blLock;
}

1
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -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<EmisCreditSalesmen> listCreditSalesmen=emisCreditSalesmenMapper.selectEmisCreditSalesmenList(queryCreditSalesmen);
if(!CollectionUtils.isEmpty(listCreditSalesmen)){

8
emis-biz/src/main/resources/mapper/EmisCreditCustomerMapper.xml
View File

@ -45,14 +45,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="curMoney != null "> and a.cur_money = #{curMoney}</if>
<if test="curMoneyRate != null "> and a.cur_money_rate = #{curMoneyRate}</if>
<if test="creditMoney != null "> and a.credit_money = #{creditMoney}</if>
<if test="currency != null and currency != ''"> and a.currency like concat('%', #{currency}, '%')</if>
<if test="transType != null and transType != ''"> and FIND_IN_SET(#{params.transType},a.trans_type)</if>
<if test="currency != null and currency != ''"> and a.currency=#{currency}</if>
<if test="transType != null and transType != ''"> and FIND_IN_SET(#{transType},a.trans_type)</if>
<if test="startDate != null "> and a.start_date = #{startDate}</if>
<if test="endDate != null "> and a.end_date = #{endDate}</if>
<if test="blOpen != null and blOpen != ''"> and a.bl_open like concat('%', #{blOpen}, '%')</if>
<if test="blOpen != null and blOpen != ''"> and a.bl_open=#{blOpen}</if>
<if test="remark != null and remark != ''"> and a.remark like concat('%', #{remark}, '%')</if>
<if test="tenantId != null and tenantId != ''"> and a.tenant_id like concat('%', #{tenantId}, '%')</if>
<if test="delFlag != null and delFlag != ''"> and a.del_flag like concat('%', #{delFlag}, '%')</if>
<if test="delFlag != null and delFlag != ''"> and a.del_flag=#{delFlag}</if>
<if test="createBy != null and createBy != ''"> and a.create_by like concat('%', #{createBy}, '%')</if>
<if test="createTime != null "> and a.create_time = #{createTime}</if>
<if test="updateBy != null and updateBy != ''"> and a.update_by like concat('%', #{updateBy}, '%')</if>

14
emis-biz/src/main/resources/mapper/EmisCreditSalesmenMapper.xml
View File

@ -16,7 +16,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="startDate" column="start_date" />
<result property="endDate" column="end_date" />
<result property="blOpen" column="bl_open" />
<result property="blLock" column="bl_lock" />
</resultMap>
<sql id="selectEmisCreditSalesmenVo">
@ -34,15 +33,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="curMoney != null "> and cur_money = #{curMoney}</if>
<if test="curMoneyRate != null "> and cur_money_rate = #{curMoneyRate}</if>
<if test="creditMoney != null "> and credit_money = #{creditMoney}</if>
<if test="currency != null and currency != ''"> and currency like concat('%', #{currency}, '%')</if>
<if test="transType != null and transType != ''"> and trans_type like concat('%', #{transType}, '%')</if>
<if test="currency != null and currency != ''"> and currency=#{currency}</if>
<if test="transType != null and transType != ''"> and FIND_IN_SET(#{transType},a.trans_type)</if>
<if test="startDate != null "> and start_date = #{startDate}</if>
<if test="endDate != null "> and end_date = #{endDate}</if>
<if test="blOpen != null and blOpen != ''"> and bl_open like concat('%', #{blOpen}, '%')</if>
<if test="blLock != null and blLock != ''"> and bl_lock like concat('%', #{blLock}, '%')</if>
<if test="blOpen != null and blOpen != ''"> and bl_open=#{blOpen}</if>
<if test="remark != null and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
<if test="tenantId != null and tenantId != ''"> and tenant_id like concat('%', #{tenantId}, '%')</if>
<if test="delFlag != null and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
<if test="delFlag != null and delFlag != ''"> and del_flag =#{delFlag}</if>
<if test="createBy != null and createBy != ''"> and create_by like concat('%', #{createBy}, '%')</if>
<if test="createTime != null "> and create_time = #{createTime}</if>
<if test="updateBy != null and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
@ -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"
<if test="startDate != null">start_date,</if>
<if test="endDate != null">end_date,</if>
<if test="blOpen != null and blOpen != ''">bl_open,</if>
<if test="blLock != null and blLock != ''">bl_lock,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="tenantId != null and tenantId != ''">tenant_id,</if>
<if test="delFlag != null and delFlag != ''">del_flag,</if>
@ -140,7 +136,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="startDate != null">#{startDate},</if>
<if test="endDate != null">#{endDate},</if>
<if test="blOpen != null and blOpen != ''">#{blOpen},</if>
<if test="blLock != null and blLock != ''">#{blLock},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="tenantId != null and tenantId != ''">#{tenantId},</if>
<if test="delFlag != null and delFlag != ''">#{delFlag},</if>
@ -166,7 +161,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="startDate != null">start_date = #{startDate},</if>
<if test="endDate != null">end_date = #{endDate},</if>
<if test="blOpen != null and blOpen != ''">bl_open = #{blOpen},</if>
<if test="blLock != null and blLock != ''">bl_lock = #{blLock},</if>
<if test="remark != null and remark != ''">remark = #{remark},</if>
<if test="tenantId != null and tenantId != ''">tenant_id = #{tenantId},</if>
<if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>