diff --git a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java index acdb8e1a9..6e845ec8b 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java @@ -1,10 +1,12 @@ package com.iformall.service; import com.iformall.common.ResultData; +import com.iformall.domain.po.WxBillProperty; import com.iformall.domain.po.WxPropertyContract; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.List; import java.util.Map; /** @@ -64,4 +66,6 @@ public interface WxPropertyContractService { void endContract(WxPropertyContract wxPropertyContract); void updatePropertyPreviewBill(WxPropertyContract record); + + List getWxBillPropertyPreview(Long id); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 091d38a36..68fef80af 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -195,13 +195,18 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService } //查询预账单用于展示 + List resultList = getWxBillPropertyPreview(id); + result.put("previewBillRentList", resultList); + + return result; + } + + @Override + public List getWxBillPropertyPreview(Long id) { WxBillProperty wxBillRent = new WxBillProperty(); wxBillRent.setPropertyContractId(id); wxBillRent.setSortColumns(WxBillProperty.Field.Period_ASC); - List resultList = wxBillPropertyMapper.findList(wxBillRent); - result.put("previewBillRentList",resultList); - - return result; + return wxBillPropertyMapper.findList(wxBillRent); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java index 583030053..0f522e2ff 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java @@ -3,6 +3,7 @@ package com.iformall.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; +import com.iformall.domain.po.WxBillProperty; import com.iformall.domain.po.WxPropertyContract; import com.iformall.domain.po.WxRentContract; import com.iformall.domain.vo.WxRentPropertyContractVo; @@ -17,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -51,6 +53,8 @@ public class WxRentPropertyContractServiceImpl implements WxRentPropertyContract WxPropertyContract wxPropertyContractQuery = new WxPropertyContract(); wxPropertyContractQuery.setRentContractId(id); WxPropertyContract propertyContract = wxPropertyContractMapper.selectOne(wxPropertyContractQuery); + List wxBillPropertyPreview = wxPropertyContractService.getWxBillPropertyPreview(propertyContract.getId()); + propertyContract.setPreviewBillRentList(wxBillPropertyPreview); data.put("property", propertyContract); return new ResultData(data); }