From 4e4d19f27229a9dc4951afe62c945d55d47a2f7b Mon Sep 17 00:00:00 2001 From: winter Date: Wed, 7 Aug 2024 16:43:00 +0800 Subject: [PATCH] fix --- .../src/main/java/com/iformall/domain/po/WxAllBill.java | 2 -- .../iformall/service/impl/WxPropertyContractServiceImpl.java | 3 +-- mallinkService/src/main/resources/mapper/WxAllBillMapper.xml | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java b/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java index 0ff98575e..7915eccca 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java @@ -315,8 +315,6 @@ public class WxAllBill extends TenantEntity { @TableField(exist = false) private Integer hasParentBillId; @TableField(exist = false) - private Integer hasFeesStardarsId; - @TableField(exist = false) private List propertyContractIds; @TableField(exist = false) private List notInIds; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 32691dde6..26869308a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -258,10 +258,9 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService wxBillRent.setSortColumns("starttime asc"); wxBillRent.updateTenantInfo(tenantEntity); //一次性的和非一次性的都有这个属性,过滤掉,就是物业主账单 - wxBillRent.setHasFeesStardarsId(EnumYesOrNo.NO.getCode()); + wxBillRent.setHasParentBillId(EnumYesOrNo.NO.getCode()); List retList = wxAllBillMapper.findList(wxBillRent); //非一次性的有这个属性 - wxBillRent.setHasFeesStardarsId(EnumYesOrNo.YES.getCode()); wxBillRent.setHasParentBillId(EnumYesOrNo.YES.getCode()); List unFixedList = wxAllBillMapper.findList(wxBillRent); Map> childMap = null; diff --git a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml index 7a91c57b7..e9fff4bee 100644 --- a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml @@ -88,8 +88,6 @@ and `merchant_id` is not null and `parent_bill_id` is not null and `parent_bill_id` is null - and `energy_fees_id` is not null - and `energy_fees_id` is null and `energy_reading_calcuteId` = #{energyReadingCalcuteId} and `energy_reading_id` = #{energyReadingId}