Selaa lähdekoodia

fix

release_toaliyun_real
winter 2 vuotta sitten
vanhempi
commit
b3215e663b
2 muutettua tiedostoa jossa 6 lisäystä ja 3 poistoa
  1. +5
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java
  2. +1
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java

+ 5
- 0
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java Näytä tiedosto

@@ -142,6 +142,11 @@ public class WxBillRentController extends BaseController {
@SystemControllerLog(description = "租赁押金账单-导出") @SystemControllerLog(description = "租赁押金账单-导出")
public void exportBill(@ModelAttribute WxBillRent wxBillRent, HttpServletRequest request, HttpServletResponse response) { public void exportBill(@ModelAttribute WxBillRent wxBillRent, HttpServletRequest request, HttpServletResponse response) {
wxBillRent.updateTenantInfo(getTenantInfo()); wxBillRent.updateTenantInfo(getTenantInfo());
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
wxBillRent.setFloorForRule(dataRule.getFloorIds());
wxBillRent.setBusinessForRule(dataRule.getBussinessIds());
}
wxBillRentService.exportBill(request, response, wxBillRent); wxBillRentService.exportBill(request, response, wxBillRent);
} }




+ 1
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java Näytä tiedosto

@@ -527,12 +527,10 @@ public class WxBillRentServiceImpl implements WxBillRentService {
e.setPayRatio(0l); e.setPayRatio(0l);
} }
if (StringUtils.isNoneBlank(rent.getLatePayRatio())) { if (StringUtils.isNoneBlank(rent.getLatePayRatio())) {
System.out.println("bid>>>>>>"+e.getId()+">>>>latepayratio>>>"+rent.getLatePayRatio());
e.setLatePayRatio(Integer.parseInt(rent.getLatePayRatio())); e.setLatePayRatio(Integer.parseInt(rent.getLatePayRatio()));
} }
e.setLatePayDay(rent.getLatePayDay()); e.setLatePayDay(rent.getLatePayDay());
if (StringUtils.isNoneBlank(rent.getLatePayRatio())) {
e.setLatePayRatio(Integer.parseInt(rent.getLatePayRatio()));
}
} }
WxBillDeposit bd = billDepositMap.get(e.getRentContractId()); WxBillDeposit bd = billDepositMap.get(e.getRentContractId());


Ladataan…
Peruuta
Tallenna