diff --git a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml index 7cf7f404f..817b23ba8 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml @@ -129,6 +129,8 @@ a.del_flag='0' and a.salesmen = #{salesmen} + and a.settle_type= #{settleType} + and a.bill_month = #{billMonth} and a.open_bill_status = #{openBillStatus} and a.payment_status = #{paymentStatus} @@ -153,6 +155,8 @@ a.del_flag='0' and a.salesmen = #{salesmen} + and a.settle_type= #{settleType} + and a.bill_month = #{billMonth} and a.open_bill_status = #{openBillStatus} and a.payment_status = #{paymentStatus} @@ -197,6 +201,8 @@ a.del_flag='0' and b.del_flag='0' and a.settle_bill_no=b.settle_bill_no and b.create_time ]]> a.payment_due_date and a.salesmen = #{salesmen} + and a.settle_type= #{settleType} + and a.bill_month = #{billMonth} and a.open_bill_status = #{openBillStatus} and a.payment_status = #{paymentStatus} @@ -219,6 +225,8 @@ a.del_flag='0' and now() ]]> a.payment_due_date and a.salesmen = #{salesmen} + and a.settle_type= #{settleType} + and a.bill_month = #{billMonth} and a.open_bill_status = #{openBillStatus} and a.payment_status = #{paymentStatus} @@ -258,6 +266,8 @@ a.del_flag='0' and a.salesmen = #{salesmen} + and a.settle_type= #{settleType} + and a.bill_month = #{billMonth} and a.open_bill_status = #{openBillStatus} and a.payment_status = #{paymentStatus} @@ -283,6 +293,8 @@ a.del_flag='0' and a.salesmen = #{salesmen} + and a.settle_type= #{settleType} + and a.bill_month = #{billMonth} and a.open_bill_status = #{openBillStatus} and a.payment_status = #{paymentStatus} @@ -305,6 +317,8 @@ a.del_flag='0' and b.del_flag='0' and FIND_IN_SET(a.settle_bill_no,b.settle_bill_no) and b.create_time a.payment_due_date and a.salesmen = #{salesmen} + and a.settle_type= #{settleType} + and a.bill_month = #{billMonth} and a.open_bill_status = #{openBillStatus} and a.payment_status = #{paymentStatus} @@ -327,6 +341,8 @@ a.del_flag='0' and b.del_flag='0' and FIND_IN_SET(a.settle_bill_no,b.settle_bill_no) and b.create_time ]]> a.payment_due_date and a.salesmen = #{salesmen} + and a.settle_type= #{settleType} + and a.bill_month = #{billMonth} and a.open_bill_status = #{openBillStatus} and a.payment_status = #{paymentStatus}