| @@ -914,18 +914,18 @@ | |||||
| <select id="allDepositList" parameterType="com.iformall.domain.vo.WxBillAll" resultMap="allVoResultMap"> | <select id="allDepositList" parameterType="com.iformall.domain.vo.WxBillAll" resultMap="allVoResultMap"> | ||||
| select bill.* | select bill.* | ||||
| from ( | from ( | ||||
| select id,merchant_id,shop_id,tenant_id,'租赁押金' name,2 billTypeValue,'租赁押金' | |||||
| bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,freeze,0 late_pay_price,0 | |||||
| select id,merchant_id,shop_id,tenant_id,'租赁押金' name,2 billTypeValue,'租赁押金','租赁押金' | |||||
| billType,need_pay,receive_pay,pay,owe,receiveDate,pay_date,expired_day,status,freeze,0 late_pay_price,0 | |||||
| service_charge_pay | service_charge_pay | ||||
| from wx_bill_rent_deposit where tenant_id=#{tenantId} | from wx_bill_rent_deposit where tenant_id=#{tenantId} | ||||
| union all | union all | ||||
| select id,merchant_id,shop_id,tenant_id,'物业押金' name,4 billTypeValue,'物业押金' | select id,merchant_id,shop_id,tenant_id,'物业押金' name,4 billTypeValue,'物业押金' | ||||
| bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,freeze,0 late_pay_price,0 | |||||
| billType,need_pay,receive_pay,pay,owe,receiveDate,pay_date,expired_day,status,freeze,0 late_pay_price,0 | |||||
| service_charge_pay | service_charge_pay | ||||
| from wx_bill_property_deposit where tenant_id=#{tenantId} | from wx_bill_property_deposit where tenant_id=#{tenantId} | ||||
| union all | union all | ||||
| select id,merchant_id,shop_id,tenant_id,comments as name,8 billTypeValue,concat('其他押金-',comments) as | select id,merchant_id,shop_id,tenant_id,comments as name,8 billTypeValue,concat('其他押金-',comments) as | ||||
| bill_type,0 as need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,freeze,0 | |||||
| billType,0 as need_pay,receive_pay,pay,owe,receiveDate,pay_date,expired_day,status,freeze,0 | |||||
| late_pay_price,service_charge_pay | late_pay_price,service_charge_pay | ||||
| from wx_bill_other_deposit where tenant_id=#{tenantId} | from wx_bill_other_deposit where tenant_id=#{tenantId} | ||||
| ) bill | ) bill | ||||