Parcourir la source

fix

release_toaliyun_real
winter il y a 2 ans
Parent
révision
30bf3632d7
5 fichiers modifiés avec 20 ajouts et 20 suppressions
  1. +4
    -4
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java
  2. +4
    -4
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java
  3. +4
    -4
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java
  4. +4
    -4
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java
  5. +4
    -4
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentManageController.java

+ 4
- 4
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java Voir le fichier

@@ -68,8 +68,8 @@ public class WxBillDailyController extends BaseController {
wxBillDaily.updateTenantInfo(getTenantInfo());
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
wxBillDaily.setFloorForRule(dataRule.getFloorForRule());
wxBillDaily.setBusinessForRule(dataRule.getBusinessForRule());
wxBillDaily.setFloorForRule(dataRule.getFloorIds());
wxBillDaily.setBusinessForRule(dataRule.getBussinessIds());
}
final PageInfo<WxBillDaily> page = wxBillDailyService.listAsPage(wxBillDaily, pageNum, pageSize);
return new ResultData(page);
@@ -254,8 +254,8 @@ public class WxBillDailyController extends BaseController {
wxBillDaily.updateTenantInfo(getTenantInfo());
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
wxBillDaily.setFloorForRule(dataRule.getFloorForRule());
wxBillDaily.setBusinessForRule(dataRule.getBusinessForRule());
wxBillDaily.setFloorForRule(dataRule.getFloorIds());
wxBillDaily.setBusinessForRule(dataRule.getBussinessIds());
}
wxBillDailyService.exportBill(request, response, wxBillDaily);
}


+ 4
- 4
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java Voir le fichier

@@ -41,8 +41,8 @@ public class WxBillOtherController extends BaseController {
}
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
wxBillOther.setFloorForRule(dataRule.getFloorForRule());
wxBillOther.setBusinessForRule(dataRule.getBusinessForRule());
wxBillOther.setFloorForRule(dataRule.getFloorIds());
wxBillOther.setBusinessForRule(dataRule.getBussinessIds());
}
wxBillOther.updateTenantInfo(getTenantInfo());
final PageInfo<WxBillOther> page = wxBillOtherService.listAsPage(wxBillOther, pageNum, pageSize);
@@ -105,8 +105,8 @@ public class WxBillOtherController extends BaseController {
wxBillOther.updateTenantInfo(getTenantInfo());
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
wxBillOther.setFloorForRule(dataRule.getFloorForRule());
wxBillOther.setBusinessForRule(dataRule.getBusinessForRule());
wxBillOther.setFloorForRule(dataRule.getFloorIds());
wxBillOther.setBusinessForRule(dataRule.getBussinessIds());
}
wxBillOtherService.exportBill(request, response, wxBillOther);
}


+ 4
- 4
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java Voir le fichier

@@ -42,8 +42,8 @@ public class WxBillOtherDepositController extends BaseController {
}
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
wxBillOtherDeposit.setFloorForRule(dataRule.getFloorForRule());
wxBillOtherDeposit.setBusinessForRule(dataRule.getBusinessForRule());
wxBillOtherDeposit.setFloorForRule(dataRule.getFloorIds());
wxBillOtherDeposit.setBusinessForRule(dataRule.getBussinessIds());
}
wxBillOtherDeposit.updateTenantInfo(getTenantInfo());
final PageInfo<WxBillOtherDeposit> page = wxBillOtherDepositService.listAsPage(wxBillOtherDeposit, pageNum, pageSize);
@@ -116,8 +116,8 @@ public class WxBillOtherDepositController extends BaseController {
wxBillDeposit.updateTenantInfo(getTenantInfo());
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
wxBillDeposit.setFloorForRule(dataRule.getFloorForRule());
wxBillDeposit.setBusinessForRule(dataRule.getBusinessForRule());
wxBillDeposit.setFloorForRule(dataRule.getFloorIds());
wxBillDeposit.setBusinessForRule(dataRule.getBussinessIds());
}
wxBillOtherDepositService.exportBill(request, response, wxBillDeposit);
}


+ 4
- 4
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java Voir le fichier

@@ -43,8 +43,8 @@ public class WxBillPropertyController extends BaseController {
wxBillProperty.updateTenantInfo(getTenantInfo());
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
wxBillProperty.setFloorForRule(dataRule.getFloorForRule());
wxBillProperty.setBusinessForRule(dataRule.getBusinessForRule());
wxBillProperty.setFloorForRule(dataRule.getFloorIds());
wxBillProperty.setBusinessForRule(dataRule.getBussinessIds());
}
wxBillProperty.setSortColumns(BaseEntity.SortField.Createtime_DESC,BaseEntity.SortField.Id_DESC);
@@ -129,8 +129,8 @@ public class WxBillPropertyController extends BaseController {
wxBillProperty.updateTenantInfo(getTenantInfo());
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
wxBillProperty.setFloorForRule(dataRule.getFloorForRule());
wxBillProperty.setBusinessForRule(dataRule.getBusinessForRule());
wxBillProperty.setFloorForRule(dataRule.getFloorIds());
wxBillProperty.setBusinessForRule(dataRule.getBussinessIds());
}
wxBillPropertyService.exportBill(request, response, wxBillProperty);
}


+ 4
- 4
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentManageController.java Voir le fichier

@@ -44,8 +44,8 @@ public class WxBillRentManageController extends BaseController {
wxBillRentManage.updateTenantInfo(getTenantInfo());
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
wxBillRentManage.setFloorForRule(dataRule.getFloorForRule());
wxBillRentManage.setBusinessForRule(dataRule.getBusinessForRule());
wxBillRentManage.setFloorForRule(dataRule.getFloorIds());
wxBillRentManage.setBusinessForRule(dataRule.getBussinessIds());
}
wxBillRentManage.setSortColumns(BaseEntity.SortField.Createtime_DESC,BaseEntity.SortField.Id_DESC);
final PageInfo<WxBillRentManage> page = wxBillRentManageService.listAsPage(wxBillRentManage, pageNum, pageSize);
@@ -138,8 +138,8 @@ public class WxBillRentManageController extends BaseController {
wxBillRent.updateTenantInfo(getTenantInfo());
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
wxBillRent.setFloorForRule(dataRule.getFloorForRule());
wxBillRent.setBusinessForRule(dataRule.getBusinessForRule());
wxBillRent.setFloorForRule(dataRule.getFloorIds());
wxBillRent.setBusinessForRule(dataRule.getBussinessIds());
}
wxBillRentManageService.exportBill(request, response, wxBillRent);
}


Chargement…
Annuler
Enregistrer