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 00e48c6d2..235cf4d1a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -249,14 +249,14 @@ public class WxRentContractController extends WxContractBaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) - public ResultData findById(Long id) { + public ResultData findById(Long id,Integer noBillList) { logger.debug("[" + getIpAddr() + "] WxRentContractController::findById"); // 同步欠缴状态 // WxAllBill wxBillRent = new WxAllBill(); // wxBillRent.updateTenantInfo(getTenantInfo()); // wxBillRentService.updateBillStatus(wxBillRent); try { - Map data = wxRentContractService.getById(id); + Map data = wxRentContractService.getById(id,noBillList); return new ResultData(data); } catch (MallinkException e) { logger.error(e.getMessage()); diff --git a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java index 32ea51e67..298d9758d 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java @@ -44,7 +44,7 @@ public interface WxRentContractService { * @param id * @return */ - Map getById(Long id); + Map getById(Long id,Integer noBillList); WxRentContract selectById(Long id); /** 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 e1ce7fbdf..d9e923ce5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -244,7 +244,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { } @Override - public Map getById(Long id) { + public Map getById(Long id,Integer noBillList) { Map 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 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 resultList = wxAllBillMapper.findContractSamePeriodSum(wxBillRent); + result.put("previewBillRentList",resultList); + } return result; } 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 cb8e171b3..228aaa05a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java @@ -14,6 +14,7 @@ import com.iformall.enums.EnumContract; import com.iformall.enums.EnumContractOperationType; import com.iformall.enums.EnumContractType; import com.iformall.enums.EnumRentShopType; +import com.iformall.enums.EnumYesOrNo; import com.iformall.mapper.WxContractCustomersMapper; import com.iformall.mapper.WxPropertyContractMapper; import com.iformall.mapper.WxRentContractMapper; @@ -162,7 +163,7 @@ public class WxRentPropertyContractServiceImpl implements WxRentPropertyContract public ResultData getContractInfo(Long rentId,Long propertyId) { Map data = new HashMap<>(2); if (null != rentId) { - Map rent = wxRentContractService.getById(rentId); + Map rent = wxRentContractService.getById(rentId,EnumYesOrNo.YES.getCode()); data.put("rent", rent); } //WxPropertyContract wxPropertyContractQuery = new WxPropertyContract();