|
|
|
@@ -244,7 +244,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
|
|
public Map<String, Object> getById(Long id) {
|
|
|
|
public Map<String, Object> getById(Long id,Integer noBillList) {
|
|
|
|
Map<String, Object> result = new HashMap<>();
|
|
|
|
WxRentContract wxRentContract = wxRentContractMapper.selectById(id);
|
|
|
|
if (wxRentContract == null) {
|
|
|
|
@@ -359,12 +359,15 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
}
|
|
|
|
|
|
|
|
//查询预账单用于展示
|
|
|
|
WxAllBill wxBillRent = new WxAllBill();
|
|
|
|
wxBillRent.setRentContractId(id);
|
|
|
|
wxBillRent.updateTenantInfo(wxRentContract);
|
|
|
|
wxBillRent.setBillType(EnumBillAllType.RENT.getCode());
|
|
|
|
List<WxAllBill> resultList = wxAllBillMapper.findContractSamePeriodSum(wxBillRent);
|
|
|
|
result.put("previewBillRentList",resultList);
|
|
|
|
if (null != noBillList && EnumYesOrNo.YES.getCode().intValue() == noBillList.intValue()) {
|
|
|
|
}else {
|
|
|
|
WxAllBill wxBillRent = new WxAllBill();
|
|
|
|
wxBillRent.setRentContractId(id);
|
|
|
|
wxBillRent.updateTenantInfo(wxRentContract);
|
|
|
|
wxBillRent.setBillType(EnumBillAllType.RENT.getCode());
|
|
|
|
List<WxAllBill> resultList = wxAllBillMapper.findContractSamePeriodSum(wxBillRent);
|
|
|
|
result.put("previewBillRentList",resultList);
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|