|
|
|
@@ -495,7 +495,7 @@ |
|
|
|
<select id="getOweBillAsPage" parameterType="com.iformall.domain.vo.WxBillAll" resultType="hashmap"> |
|
|
|
select bill.tenant_id tenantId,bill.merchant_id merchantId,m.name merchantName,bill.bill_type billType, |
|
|
|
m.link_phone managerPhone,m.`link_person` manager,m.email, |
|
|
|
bill.receive_date receiveDate,DATEDIFF(now(),bill.receive_date) expiredDay,mb.building_name building,mf.floor_name floor, |
|
|
|
bill.receive_date receiveDate,DATEDIFF(now(),bill.receive_date) expiredDay, |
|
|
|
|
|
|
|
round(bill.rentOwe/100,2) rentOwe, |
|
|
|
round(bill.propertyOwe/100,2) propertyOwe, |
|
|
|
@@ -517,7 +517,7 @@ |
|
|
|
round(bill.propertyReceivePay/100,2) propertyReceivePay, |
|
|
|
round(bill.depositReceivePay/100,2) depositReceivePay, |
|
|
|
round(bill.otherReceivePay/100,2) otherReceivePay, |
|
|
|
round((bill.rentOwe+bill.propertyOwe+bill.depositOwe+bill.otherOwe)/100,2) totalReceivePay |
|
|
|
round((bill.rentReceivePay+bill.propertyReceivePay+bill.depositReceivePay+bill.otherReceivePay)/100,2) totalReceivePay |
|
|
|
</otherwise> |
|
|
|
</choose> |
|
|
|
|
|
|
|
@@ -583,10 +583,6 @@ |
|
|
|
|
|
|
|
) bill |
|
|
|
left join wx_merchant m on bill.merchant_id=m.id |
|
|
|
left join wx_merchant_shop ms on ms.`merchant_id` = m.id |
|
|
|
left join wx_shop ws on ms.`shop_id` = ws.id |
|
|
|
left join wx_mall_building mb on ws.building = mb.id |
|
|
|
left join wx_mall_floor mf on ws.floor = mf.id |
|
|
|
where m.status=1 and m.tenant_id = #{tenantId} |
|
|
|
<if test=" null != month and ''!=month"> |
|
|
|
and date_format(bill.receive_date,'%Y-%m')=#{month} |
|
|
|
|