diff --git a/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml
index dd1056b50..b79a94c32 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml
@@ -279,71 +279,71 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
del_flag='0'
- and id = #{id}
- and pay_id = #{payId}
- and pay_type = #{payType}
- and rec_type = #{recType}
- and pay_man like concat('%', #{payMan}, '%')
- and pay_man_code like concat('%', #{payManCode}, '%')
+ and a.id = #{id}
+ and a.pay_id = #{payId}
+ and a.pay_type = #{payType}
+ and a.rec_type = #{recType}
+ and a.pay_man like concat('%', #{payMan}, '%')
+ and a.pay_man_code like concat('%', #{payManCode}, '%')
- and bl_audit = #{blAudit}
- and audit_date = #{auditDate}
- and audit_man_code = #{auditManCode}
- and audit_site_code = #{auditSiteCode}
- and customer_code = #{customerCode}
- and customer_name like concat('%', #{customerName}, '%')
- and pay_money = #{payMoney}
- and pay_status = #{payStatus}
- and pay_status_desc like concat('%', #{payStatusDesc}, '%')
- and break_type = #{breakType}
- and break_reason like concat('%', #{breakReason}, '%')
- and break_emp_code = #{breakEmpCode}
- and rec_man_code = #{recManCode}
- and settle_type = #{settleType}
- and refund_date = #{refundDate}
- and refund_man_code = #{refundManCode}
- and refund_seq = #{refundSeq}
- and refund_mode = #{refundMode}
- and refund_money = #{refundMoney}
- and refund_reason like concat('%', #{refundReason}, '%')
- and refund_remark like concat('%', #{refundRemark}, '%')
- and refund_op_man_code = #{refundOpManCode}
- and refund_register_site_code = #{refundRegisterSiteCode}
- and refund_register_man_code = #{refundRegisterManCode}
- and satisfy_money = #{satisfyMoney}
- and satisfy_reason like concat('%', #{satisfyReason}, '%')
- and allowance_money = #{allowanceMoney}
- and allowance_reason = #{allowanceReason}
- and deduction_money = #{deductionMoney}
- and deduction_reason = #{deductionReason}
- and other_money = #{otherMoney}
- and other_reason like concat('%', #{otherReason}, '%')
- and trade_date = #{tradeDate}
- and remark like concat('%', #{remark}, '%')
- and del_flag like concat('%', #{delFlag}, '%')
- and create_by like concat('%', #{createBy}, '%')
- and create_time = #{createTime}
- and update_by like concat('%', #{updateBy}, '%')
- and update_time = #{updateTime}
- and create_site like concat('%', #{createSite}, '%')
- and update_site like concat('%', #{updateSite}, '%')
+ and a.bl_audit = #{blAudit}
+ and a.audit_date = #{auditDate}
+ and a.audit_man_code = #{auditManCode}
+ and a.audit_site_code = #{auditSiteCode}
+ and a.customer_code = #{customerCode}
+ and a.customer_name like concat('%', #{customerName}, '%')
+ and a.pay_money = #{payMoney}
+ and a.pay_status = #{payStatus}
+ and a.pay_status_desc like concat('%', #{payStatusDesc}, '%')
+ and a.break_type = #{breakType}
+ and a.break_reason like concat('%', #{breakReason}, '%')
+ and a.break_emp_code = #{breakEmpCode}
+ and a.rec_man_code = #{recManCode}
+ and a.settle_type = #{settleType}
+ and a.refund_date = #{refundDate}
+ and a.refund_man_code = #{refundManCode}
+ and a.refund_seq = #{refundSeq}
+ and a.refund_mode = #{refundMode}
+ and a.refund_money = #{refundMoney}
+ and a.refund_reason like concat('%', #{refundReason}, '%')
+ and a.refund_remark like concat('%', #{refundRemark}, '%')
+ and a.refund_op_man_code = #{refundOpManCode}
+ and a.refund_register_site_code = #{refundRegisterSiteCode}
+ and a.refund_register_man_code = #{refundRegisterManCode}
+ and a.satisfy_money = #{satisfyMoney}
+ and a.satisfy_reason like concat('%', #{satisfyReason}, '%')
+ and a.allowance_money = #{allowanceMoney}
+ and a.allowance_reason = #{allowanceReason}
+ and a.deduction_money = #{deductionMoney}
+ and a.deduction_reason = #{deductionReason}
+ and a.other_money = #{otherMoney}
+ and a.other_reason like concat('%', #{otherReason}, '%')
+ and a.trade_date = #{tradeDate}
+ and a.remark like concat('%', #{remark}, '%')
+ and a.del_flag like concat('%', #{delFlag}, '%')
+ and a.create_by like concat('%', #{createBy}, '%')
+ and a.create_time = #{createTime}
+ and a.update_by like concat('%', #{updateBy}, '%')
+ and a.update_time = #{updateTime}
+ and a.create_site like concat('%', #{createSite}, '%')
+ and a.update_site like concat('%', #{updateSite}, '%')
- and create_time = ]]> #{params.beginCreateTime}
+ and a.create_time = ]]> #{params.beginCreateTime}
- and create_time #{params.endCreateTime}
+ and a.create_time #{params.endCreateTime}
- and trade_date = ]]> #{params.beginTradeDate}
+ and a.trade_date = ]]> #{params.beginTradeDate}
- and trade_date #{params.endTradeDate}
+ and a.trade_date #{params.endTradeDate}
- and pay_id in(
+ and a.pay_id in(
select pay_id from emis_settle_pay_rel espr
where espr.del_flag='0'
and FIND_IN_SET(espr.`bill_no`,#{params.billCode})
@@ -351,7 +351,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- and pay_id in(
+ and a.pay_id in(
select pay_id from emis_settle_pay_bill_rel espbr
where espbr.del_flag='0'
and FIND_IN_SET(espbr.settle_bill_no,#{settleBillNo})
@@ -360,7 +360,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- and settle_bill_no in(
+ and a.settle_bill_no in(
select settle_bill_no from emis_settle_sub_bill b where del_flag='0'
and (
b.salesmen=#{params.privEmpName}