diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseEntity.java index 024c34b27..10dd7706e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseEntity.java @@ -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"), 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 05213fedc..eacd14651 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -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()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 50de867e1..b932e901d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -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 resultList = wxAllBillMapper.findList(wxBillRent);