Quellcode durchsuchen

fix

release_toaliyun_real
winter vor 1 Jahr
Ursprung
Commit
cc41cca9d5
2 geänderte Dateien mit 3 neuen und 3 gelöschten Zeilen
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/enums/EnumBillExtraCreateFrom.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java Datei anzeigen

@@ -879,7 +879,7 @@ public class WxAllBillController extends BillBaseController {
record.setEnergyFeesIds(feesIdList);; record.setEnergyFeesIds(feesIdList);;
} }
record.setIsPreview(EnumYesOrNo.NO.getCode()); 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()) { if (record.getNeedPayNoDays() == EnumYesOrNo.YES.getCode() && null != record.getReceiveDateEnd()) {


+ 2
- 2
mallinkService/src/main/java/com/iformall/enums/EnumBillExtraCreateFrom.java Datei anzeigen

@@ -6,8 +6,8 @@ package com.iformall.enums;
*/ */


public enum EnumBillExtraCreateFrom { 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) { public static EnumBillExtraCreateFrom getEnum(Integer code) {


Laden…
Abbrechen
Speichern