diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyController.java index 246ab4529..de442ca90 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyController.java @@ -35,6 +35,7 @@ public class WxBillPropertyController extends BaseController { wxBillProperty = new WxBillProperty(); } wxBillProperty.setTenantId(getTenantId()); + wxBillProperty.setSortColumns(WxBillProperty.Field.Id_ASC); PageInfo> result = wxBillPropertyService.listAsPage(wxBillProperty, pageNum, pageSize); return new ResultData(result); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java index 7a3501907..995a56f85 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java @@ -351,7 +351,7 @@ public class WxBillRent implements Serializable { sb.append(","); sb.append(fields[k].toString()); } - + this.sortColumns = sb.toString(); } public void setSortColumns(String sortColumns) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index dd840d6e2..4ea2ef954 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -92,6 +92,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { public Map getById(Long id) { WxBillRent record = new WxBillRent(); record.setId(id); + record.setSortColumns(WxBillRent.Field.Id_ASC); return wxBillRentMapper.queryBillRentList(record).get(0); } diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index 21adf4457..7f8583c83 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -83,12 +83,13 @@ br.`property_contract_id` propertyContractId,d.receive_pay deposit,case when br.late_pay_time is null then 0 else FLOOR(DATEDIFF(now(),br.late_pay_time)*br.late_pay_ratio/10000*br.owe) end latePayPrice, - (select max(period) from wx_bill_property where id=br.id) allPeriod,d.`status` depositStatus + (select max(period) from wx_bill_property where property_contract_id=br.property_contract_id) + allPeriod,d.`status` depositStatus from wx_bill_property br left join wx_merchant m on br.merchant_id=m.id left join wx_shop s on br.shop_id=s.id left join wx_bill_property_deposit d on br.property_contract_id=d.property_contract_id - is_preview = 0 + br.is_preview = 0 and br.`id` = #{id} and br.`merchant_id` = #{merchantId} and m.`name` like concat('%',#{merchantName},'%') @@ -99,7 +100,7 @@ and br.`rent_shop_type` = #{rentShopType} - order by ${sortColumns} + order by br.${sortColumns}