|
|
|
@@ -837,7 +837,7 @@ public class WxAllBillController extends BillBaseController { |
|
|
|
record.setEnergyFeesIds(feesIdList);; |
|
|
|
} |
|
|
|
record.setIsPreview(EnumYesOrNo.NO.getCode()); |
|
|
|
record.setSortColumns("starttime asc , merchant_id desc"); |
|
|
|
record.setSortColumns("starttime asc , shop_id desc"); |
|
|
|
|
|
|
|
//未收明细表根据收款日查询 |
|
|
|
if (record.getNeedPayNoDays() == EnumYesOrNo.YES.getCode() && null != record.getReceiveDateEnd()) { |
|
|
|
|