| @@ -134,4 +134,7 @@ public class WxBillDaily extends TenantEntity { | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private String month; | private String month; | ||||
| @TableField(exist = false) | |||||
| private Integer onlyOwe; | |||||
| } | } | ||||
| @@ -102,4 +102,7 @@ public class WxBillDeposit extends TenantEntity { | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private String month; | private String month; | ||||
| @TableField(exist = false) | |||||
| private Integer onlyOwe; | |||||
| } | } | ||||
| @@ -166,5 +166,8 @@ public class WxBillOther extends TenantEntity { | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private String month; | private String month; | ||||
| @TableField(exist = false) | |||||
| private Integer onlyOwe; | |||||
| } | } | ||||
| @@ -169,4 +169,7 @@ public class WxBillOtherDeposit extends TenantEntity { | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private String month; | private String month; | ||||
| @TableField(exist = false) | |||||
| private Integer onlyOwe; | |||||
| } | } | ||||
| @@ -234,4 +234,7 @@ public class WxBillProperty extends TenantEntity { | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private String month; | private String month; | ||||
| @TableField(exist = false) | |||||
| private Integer onlyOwe; | |||||
| } | } | ||||
| @@ -101,4 +101,7 @@ public class WxBillPropertyDeposit extends TenantEntity { | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private String month; | private String month; | ||||
| @TableField(exist = false) | |||||
| private Integer onlyOwe; | |||||
| } | } | ||||
| @@ -286,5 +286,8 @@ public class WxBillRent extends TenantEntity { | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private String month; | private String month; | ||||
| @TableField(exist = false) | |||||
| private Integer onlyOwe; | |||||
| } | } | ||||
| @@ -221,5 +221,8 @@ public class WxBillRentManage extends TenantEntity { | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private String month; | private String month; | ||||
| @TableField(exist = false) | |||||
| private Integer onlyOwe; | |||||
| } | } | ||||
| @@ -101,6 +101,7 @@ | |||||
| <if test=" null != month and '' != month"> | <if test=" null != month and '' != month"> | ||||
| and date_format(br.starttime,'%Y-%m') <= #{month} and date_format(br.endtime,'%Y-%m') >= #{month} | and date_format(br.starttime,'%Y-%m') <= #{month} and date_format(br.endtime,'%Y-%m') >= #{month} | ||||
| </if> | </if> | ||||
| <if test=" null != onlyOwe">and br.`owe` > 0</if> | |||||
| <if test=" null != buildWay ">and br.`build_way` = #{buildWay}</if> | <if test=" null != buildWay ">and br.`build_way` = #{buildWay}</if> | ||||
| <if test=" null != merchantIds "> | <if test=" null != merchantIds "> | ||||
| and br.`merchant_id` in | and br.`merchant_id` in | ||||
| @@ -123,6 +123,7 @@ | |||||
| <if test=" null != month and '' != month"> | <if test=" null != month and '' != month"> | ||||
| and date_format(br.starttime,'%Y-%m') <= #{month} and date_format(br.endtime,'%Y-%m') >= #{month} | and date_format(br.starttime,'%Y-%m') <= #{month} and date_format(br.endtime,'%Y-%m') >= #{month} | ||||
| </if> | </if> | ||||
| <if test=" null != onlyOwe">and br.`owe` > 0</if> | |||||
| <if test=" null != merchantIds "> | <if test=" null != merchantIds "> | ||||
| and br.`merchant_id` in | and br.`merchant_id` in | ||||
| <foreach collection="merchantIds" index="index" item="midItem" open="(" separator="," close=")"> | <foreach collection="merchantIds" index="index" item="midItem" open="(" separator="," close=")"> | ||||
| @@ -107,6 +107,7 @@ | |||||
| <if test=" null != month and '' != month"> | <if test=" null != month and '' != month"> | ||||
| and date_format(br.starttime,'%Y-%m') <= #{month} and date_format(br.endtime,'%Y-%m') >= #{month} | and date_format(br.starttime,'%Y-%m') <= #{month} and date_format(br.endtime,'%Y-%m') >= #{month} | ||||
| </if> | </if> | ||||
| <if test=" null != onlyOwe">and br.`owe` > 0</if> | |||||
| <if test=" null != merchantIds "> | <if test=" null != merchantIds "> | ||||
| and br.`merchant_id` in | and br.`merchant_id` in | ||||
| <foreach collection="merchantIds" index="index" item="midItem" open="(" separator="," close=")"> | <foreach collection="merchantIds" index="index" item="midItem" open="(" separator="," close=")"> | ||||
| @@ -102,6 +102,7 @@ | |||||
| <if test=" null != month and '' != month"> | <if test=" null != month and '' != month"> | ||||
| and date_format(br.starttime,'%Y-%m') <= #{month} and date_format(br.endtime,'%Y-%m') >= #{month} | and date_format(br.starttime,'%Y-%m') <= #{month} and date_format(br.endtime,'%Y-%m') >= #{month} | ||||
| </if> | </if> | ||||
| <if test=" null != onlyOwe">and br.`owe` > 0</if> | |||||
| <if test=" null != merchantIds "> | <if test=" null != merchantIds "> | ||||
| and br.`merchant_id` in | and br.`merchant_id` in | ||||
| <foreach collection="merchantIds" index="index" item="midItem" open="(" separator="," close=")"> | <foreach collection="merchantIds" index="index" item="midItem" open="(" separator="," close=")"> | ||||
| @@ -113,6 +113,7 @@ | |||||
| <if test=" null != month and '' != month"> | <if test=" null != month and '' != month"> | ||||
| and date_format(br.starttime,'%Y-%m') <= #{month} and date_format(br.endtime,'%Y-%m') >= #{month} | and date_format(br.starttime,'%Y-%m') <= #{month} and date_format(br.endtime,'%Y-%m') >= #{month} | ||||
| </if> | </if> | ||||
| <if test=" null != onlyOwe">and br.`owe` > 0</if> | |||||
| <if test=" null != merchantIds "> | <if test=" null != merchantIds "> | ||||
| and br.`merchant_id` in | and br.`merchant_id` in | ||||
| <foreach collection="merchantIds" index="index" item="midItem" open="(" separator="," close=")"> | <foreach collection="merchantIds" index="index" item="midItem" open="(" separator="," close=")"> | ||||
| @@ -134,6 +134,7 @@ | |||||
| <if test=" null != month and '' != month"> | <if test=" null != month and '' != month"> | ||||
| and date_format(br.starttime,'%Y-%m') <= #{month} and date_format(br.endtime,'%Y-%m') >= #{month} | and date_format(br.starttime,'%Y-%m') <= #{month} and date_format(br.endtime,'%Y-%m') >= #{month} | ||||
| </if> | </if> | ||||
| <if test=" null != onlyOwe">and br.`owe` > 0</if> | |||||
| <if test=" null != rentShopType ">and br.`rent_shop_type` = #{rentShopType}</if> | <if test=" null != rentShopType ">and br.`rent_shop_type` = #{rentShopType}</if> | ||||
| <if test=" null != propertyContractId ">and br.`property_contract_id` = #{propertyContractId}</if> | <if test=" null != propertyContractId ">and br.`property_contract_id` = #{propertyContractId}</if> | ||||
| <if test=" null != payWay ">and br.`pay_way` = #{payWay}</if> | <if test=" null != payWay ">and br.`pay_way` = #{payWay}</if> | ||||
| @@ -119,7 +119,8 @@ | |||||
| <if test=" null != endtime">and br.`endtime` >= #{endtime}</if> | <if test=" null != endtime">and br.`endtime` >= #{endtime}</if> | ||||
| <if test=" null != month and '' != month"> | <if test=" null != month and '' != month"> | ||||
| and date_format(br.starttime,'%Y-%m') <= #{month} and date_format(br.endtime,'%Y-%m') >= #{month} | and date_format(br.starttime,'%Y-%m') <= #{month} and date_format(br.endtime,'%Y-%m') >= #{month} | ||||
| </if> | |||||
| </if> | |||||
| <if test=" null != onlyOwe">and br.`owe` > 0</if> | |||||
| <if test=" null != manageFeeType ">and br.`manage_fee_type` = #{manageFeeType}</if> | <if test=" null != manageFeeType ">and br.`manage_fee_type` = #{manageFeeType}</if> | ||||
| <if test=" null != hasMerchant ">and br.`merchant_id` is not null</if> | <if test=" null != hasMerchant ">and br.`merchant_id` is not null</if> | ||||
| @@ -140,6 +140,7 @@ | |||||
| <if test=" null != month and '' != month"> | <if test=" null != month and '' != month"> | ||||
| and date_format(br.starttime,'%Y-%m') <= #{month} and date_format(br.endtime,'%Y-%m') >= #{month} | and date_format(br.starttime,'%Y-%m') <= #{month} and date_format(br.endtime,'%Y-%m') >= #{month} | ||||
| </if> | </if> | ||||
| <if test=" null != onlyOwe">and br.`owe` > 0</if> | |||||
| <if test=" null != rentContractIdList "> | <if test=" null != rentContractIdList "> | ||||
| and br.`rent_contract_id` in | and br.`rent_contract_id` in | ||||
| <foreach collection="rentContractIdList" index="index" item="ridItem" open="(" separator="," close=")"> | <foreach collection="rentContractIdList" index="index" item="ridItem" open="(" separator="," close=")"> | ||||