Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
185bb7d0c4
3 changed files with 2 additions and 5 deletions
  1. +0
    -3
      mallinkService/src/main/java/com/iformall/domain/po/base/BaseEntity.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 0
- 3
mallinkService/src/main/java/com/iformall/domain/po/base/BaseEntity.java View File

@@ -206,9 +206,6 @@ public class BaseEntity implements Serializable {
Points_ASC("`points` ASC"),
Points_DESC("`points` DESC"),

Period_ASC("`period` ASC"),
Period_DESC("`period` DESC"),

UsedPower_ASC("`usedPower` ASC"),
UsedPower_DESC("`usedPower` DESC"),



+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java View File

@@ -255,7 +255,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
//查询主账单列表,排除其他标砖费用,包括一次性费用,非一次性费用
WxAllBill wxBillRent = new WxAllBill();
wxBillRent.setPropertyContractId(id);
wxBillRent.setSortColumns(BaseEntity.SortField.Period_ASC);
wxBillRent.setSortColumns("starttime asc");
wxBillRent.updateTenantInfo(tenantEntity);
//一次性的和非一次性的都有这个属性,过滤掉,就是物业主账单
wxBillRent.setHasFeesStardarsId(EnumYesOrNo.NO.getCode());


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java View File

@@ -612,7 +612,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
//查询预账单用于展示
WxAllBill wxBillRent = new WxAllBill();
wxBillRent.setRentContractId(record.getId());
wxBillRent.setSortColumns(BaseEntity.SortField.Period_ASC);
wxBillRent.setSortColumns("starttime asc");
wxBillRent.setIsPreview(EnumIsPreview.YES.getCode());
wxBillRent.updateTenantInfo(record);
List<WxAllBill> resultList = wxAllBillMapper.findList(wxBillRent);


Loading…
Cancel
Save