diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index 2b2472ae4..dcbbb2b8e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -383,6 +383,7 @@ public class WxRentContractController extends WxContractBaseController { bq.setRentContractId(sales.getRentContractId()); bq.setEnergyFeesId(ad.getFeesId()); bq.setIsPreview(EnumYesOrNo.NO.getCode()); + bq.setIsJoinRenevue(EnumYesOrNo.YES.getCode()); bq.setStarttimeEqual(sales.getStarttime()); bq.setEndtimeEqual(sales.getEndtime()); PageInfo billPage = wxAllBillService.listAsPage(bq,1,100); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 2e3688361..7a406050d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -52,6 +52,7 @@ import com.iformall.enums.EnumContractOperationType; import com.iformall.enums.EnumContractReceivePeriodUnit; import com.iformall.enums.EnumEndProperty; import com.iformall.enums.EnumFeesStandardsCalcuteUnit; +import com.iformall.enums.EnumFeesType; import com.iformall.enums.EnumFlowKey; import com.iformall.enums.EnumFlowRecordStatus; import com.iformall.enums.EnumFromType; @@ -1190,6 +1191,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { bmbill.setEnergyFeesId(feesId); bmbill.setRentContractId(rentcontract.getId()); 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.setShopId(sid); String cusName = null;