Sfoglia il codice sorgente

fix

release_toaliyun_real
winter 10 mesi fa
parent
commit
2f3ea24e74
2 ha cambiato i file con 5 aggiunte e 0 eliminazioni
  1. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  2. +4
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java Vedi File

@@ -383,6 +383,7 @@ public class WxRentContractController extends WxContractBaseController {
bq.setRentContractId(sales.getRentContractId()); bq.setRentContractId(sales.getRentContractId());
bq.setEnergyFeesId(ad.getFeesId()); bq.setEnergyFeesId(ad.getFeesId());
bq.setIsPreview(EnumYesOrNo.NO.getCode()); bq.setIsPreview(EnumYesOrNo.NO.getCode());
bq.setIsJoinRenevue(EnumYesOrNo.YES.getCode());
bq.setStarttimeEqual(sales.getStarttime()); bq.setStarttimeEqual(sales.getStarttime());
bq.setEndtimeEqual(sales.getEndtime()); bq.setEndtimeEqual(sales.getEndtime());
PageInfo<WxAllBill> billPage = wxAllBillService.listAsPage(bq,1,100); PageInfo<WxAllBill> billPage = wxAllBillService.listAsPage(bq,1,100);


+ 4
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Vedi File

@@ -52,6 +52,7 @@ import com.iformall.enums.EnumContractOperationType;
import com.iformall.enums.EnumContractReceivePeriodUnit; import com.iformall.enums.EnumContractReceivePeriodUnit;
import com.iformall.enums.EnumEndProperty; import com.iformall.enums.EnumEndProperty;
import com.iformall.enums.EnumFeesStandardsCalcuteUnit; import com.iformall.enums.EnumFeesStandardsCalcuteUnit;
import com.iformall.enums.EnumFeesType;
import com.iformall.enums.EnumFlowKey; import com.iformall.enums.EnumFlowKey;
import com.iformall.enums.EnumFlowRecordStatus; import com.iformall.enums.EnumFlowRecordStatus;
import com.iformall.enums.EnumFromType; import com.iformall.enums.EnumFromType;
@@ -1190,6 +1191,9 @@ public class WxRentContractServiceImpl implements WxRentContractService {
bmbill.setEnergyFeesId(feesId); bmbill.setEnergyFeesId(feesId);
bmbill.setRentContractId(rentcontract.getId()); bmbill.setRentContractId(rentcontract.getId());
bmbill.setIsPreview(EnumYesOrNo.NO.getCode()); bmbill.setIsPreview(EnumYesOrNo.NO.getCode());
bmbill.setIsDel(EnumYesOrNo.NO.getCode());
bmbill.setIsJoinRenevue(EnumYesOrNo.NO.getCode());
bmbill.setFeesType(EnumFeesType.NOMAL.getCode());
bmbill.setCanEdit(EnumYesOrNo.NO.getCode()); bmbill.setCanEdit(EnumYesOrNo.NO.getCode());
bmbill.setShopId(sid); bmbill.setShopId(sid);
String cusName = null; String cusName = null;


Caricamento…
Annulla
Salva