| @@ -315,8 +315,6 @@ public class WxAllBill extends TenantEntity { | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private Integer hasParentBillId; | private Integer hasParentBillId; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private Integer hasFeesStardarsId; | |||||
| @TableField(exist = false) | |||||
| private List<Long> propertyContractIds; | private List<Long> propertyContractIds; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private List<Long> notInIds; | private List<Long> notInIds; | ||||
| @@ -258,10 +258,9 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||||
| wxBillRent.setSortColumns("starttime asc"); | wxBillRent.setSortColumns("starttime asc"); | ||||
| wxBillRent.updateTenantInfo(tenantEntity); | wxBillRent.updateTenantInfo(tenantEntity); | ||||
| //一次性的和非一次性的都有这个属性,过滤掉,就是物业主账单 | //一次性的和非一次性的都有这个属性,过滤掉,就是物业主账单 | ||||
| wxBillRent.setHasFeesStardarsId(EnumYesOrNo.NO.getCode()); | |||||
| wxBillRent.setHasParentBillId(EnumYesOrNo.NO.getCode()); | |||||
| List<WxAllBill> retList = wxAllBillMapper.findList(wxBillRent); | List<WxAllBill> retList = wxAllBillMapper.findList(wxBillRent); | ||||
| //非一次性的有这个属性 | //非一次性的有这个属性 | ||||
| wxBillRent.setHasFeesStardarsId(EnumYesOrNo.YES.getCode()); | |||||
| wxBillRent.setHasParentBillId(EnumYesOrNo.YES.getCode()); | wxBillRent.setHasParentBillId(EnumYesOrNo.YES.getCode()); | ||||
| List<WxAllBill> unFixedList = wxAllBillMapper.findList(wxBillRent); | List<WxAllBill> unFixedList = wxAllBillMapper.findList(wxBillRent); | ||||
| Map<Long,List<WxAllBill>> childMap = null; | Map<Long,List<WxAllBill>> childMap = null; | ||||
| @@ -88,8 +88,6 @@ | |||||
| <if test=" null != hasMerchant ">and `merchant_id` is not null</if> | <if test=" null != hasMerchant ">and `merchant_id` is not null</if> | ||||
| <if test=" 1 == hasParentBillId ">and `parent_bill_id` is not null</if> | <if test=" 1 == hasParentBillId ">and `parent_bill_id` is not null</if> | ||||
| <if test=" 0 == hasParentBillId ">and `parent_bill_id` is null</if> | <if test=" 0 == hasParentBillId ">and `parent_bill_id` is null</if> | ||||
| <if test=" 1 == hasFeesStardarsId ">and `energy_fees_id` is not null</if> | |||||
| <if test=" 0 == hasFeesStardarsId ">and `energy_fees_id` is null</if> | |||||
| <if test=" null != energyReadingCalcuteId ">and `energy_reading_calcuteId` = #{energyReadingCalcuteId}</if> | <if test=" null != energyReadingCalcuteId ">and `energy_reading_calcuteId` = #{energyReadingCalcuteId}</if> | ||||
| <if test=" null != energyReadingId ">and `energy_reading_id` = #{energyReadingId}</if> | <if test=" null != energyReadingId ">and `energy_reading_id` = #{energyReadingId}</if> | ||||
| <if test=" null != rentContractIdList "> | <if test=" null != rentContractIdList "> | ||||