diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java index 3afbe14f4..f19a7a9e2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java @@ -879,7 +879,7 @@ public class WxAllBillController extends BillBaseController { record.setEnergyFeesIds(feesIdList);; } record.setIsPreview(EnumYesOrNo.NO.getCode()); - record.setSortColumns("starttime asc , shop_id desc"); + record.setSortColumns("starttime asc , shop_id asc, energy_fees_id asc"); //未收明细表根据收款日查询 if (record.getNeedPayNoDays() == EnumYesOrNo.YES.getCode() && null != record.getReceiveDateEnd()) { diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumBillExtraCreateFrom.java b/mallinkService/src/main/java/com/iformall/enums/EnumBillExtraCreateFrom.java index 86ed7180c..e51aafabf 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumBillExtraCreateFrom.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumBillExtraCreateFrom.java @@ -6,8 +6,8 @@ package com.iformall.enums; */ public enum EnumBillExtraCreateFrom { - RNET_TIAODIAN_HUISUAN(1,"跳点合同年度汇算差额自动生成"), - RNET_REVENUE_SALES(2,"录入销售额自动生成") + RNET_TIAODIAN_HUISUAN(1,"跳点合同年度汇算"), + RNET_REVENUE_SALES(2,"录入销售额") ; public static EnumBillExtraCreateFrom getEnum(Integer code) {