winter 1 год назад
Родитель
Сommit
4e4d19f272
3 измененных файлов: 1 добавлений и 6 удалений
  1. +0
    -2
      mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java
  2. +1
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  3. +0
    -2
      mallinkService/src/main/resources/mapper/WxAllBillMapper.xml

+ 0
- 2
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<Long> propertyContractIds;
@TableField(exist = false)
private List<Long> notInIds;


+ 1
- 2
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<WxAllBill> retList = wxAllBillMapper.findList(wxBillRent);
//非一次性的有这个属性
wxBillRent.setHasFeesStardarsId(EnumYesOrNo.YES.getCode());
wxBillRent.setHasParentBillId(EnumYesOrNo.YES.getCode());
List<WxAllBill> unFixedList = wxAllBillMapper.findList(wxBillRent);
Map<Long,List<WxAllBill>> childMap = null;


+ 0
- 2
mallinkService/src/main/resources/mapper/WxAllBillMapper.xml Просмотреть файл

@@ -88,8 +88,6 @@
<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=" 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 != energyReadingId ">and `energy_reading_id` = #{energyReadingId}</if>
<if test=" null != rentContractIdList ">


Загрузка…
Отмена
Сохранить