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 96615103b..06a58cf78 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -407,7 +407,10 @@ public class WxRentContractController extends WxContractBaseController { public ResultData getRentContractList(@ModelAttribute WxRentContract wxRentContract) { logger.debug("[" + getIpAddr() + "] WxRentContractController::getRentContractList"); wxRentContract.updateTenantInfo(getTenantInfo()); - wxRentContract.setStatuss(EnumRentContractStatus.getValidStatus()); + List statss = new ArrayList(); + statss.add(EnumRentContractStatus.PAING.getCode()); + statss.add(EnumRentContractStatus.OUT_DATE.getCode()); + wxRentContract.setStatuss(statss); wxRentContract.setSortColumn(BaseEntity.SortField.Createtime_DESC.getValue()); PageInfo page = wxRentContractService.getRentContractList(wxRentContract, 1, 100000); if (null != page && null != page.getList()) { @@ -827,12 +830,12 @@ public class WxRentContractController extends WxContractBaseController { // } - @PostMapping("updateRentContractStatus") - @SystemControllerLog(description = "租赁合同-更新合同状态") - public ResultData updateRentContractStatus(@RequestBody WxRentContract wxRentContract) { - logger.debug("[" + getIpAddr() + "] WxRentContractController::updateRentContractStatus"); - return wxRentContractService.updateRentContractStatus(wxRentContract.getId()); - } +// @PostMapping("updateRentContractStatus") +// @SystemControllerLog(description = "租赁合同-更新合同状态") +// public ResultData updateRentContractStatus(@RequestBody WxRentContract wxRentContract) { +// logger.debug("[" + getIpAddr() + "] WxRentContractController::updateRentContractStatus"); +// return wxRentContractService.updateRentContractStatus(wxRentContract.getId()); +// } @PostMapping("savePayAccountInfo") @SystemControllerLog(description = "租赁合同-保存甲方账户") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java index 4b533c395..24761609e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java @@ -147,7 +147,7 @@ public class WxRentPropertyContractController extends WxContractBaseController { @ApiImplicitParam(name = "id", value = "租金合同编号(工作流用)", dataType = "String", paramType = "query", required = false)}) public ResultData findById(Long rentId,Long propertyId,String id) { logger.debug("[" + getIpAddr() + "] wxRentPropertyContract::findById"); - if (null != rentId && null != propertyId) { + if (null != rentId || null != propertyId) { return wxRentPropertyContractService.getContractInfo(rentId,propertyId); }else if (!StringUtils.isBlank(id)) { //租金+物业工作流查询会传此id 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 9621191d7..8d1b87f63 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java @@ -54,16 +54,20 @@ public class WxRentPropertyContractServiceImpl implements WxRentPropertyContract @Override public ResultData getContractInfo(Long rentId,Long propertyId) { Map data = new HashMap<>(2); - Map rent = wxRentContractService.getById(rentId); - data.put("rent", rent); + if (null != rentId) { + Map rent = wxRentContractService.getById(rentId); + data.put("rent", rent); + } //WxPropertyContract wxPropertyContractQuery = new WxPropertyContract(); //wxPropertyContractQuery.setRentContractId(rentId); //WxPropertyContract propertyContract = wxPropertyContractMapper.selectOne(new QueryWrapper(wxPropertyContractQuery)); - WxPropertyContract propertyContract = wxPropertyContractMapper.selectById(propertyId); - if (propertyContract != null) { - List wxBillPropertyPreview = wxPropertyContractService.getWxBillPropertyPreview(propertyContract.getId()); - propertyContract.setPreviewBillRentList(wxBillPropertyPreview); - data.put("property", propertyContract); + if (null != propertyId) { + WxPropertyContract propertyContract = wxPropertyContractMapper.selectById(propertyId); + if (propertyContract != null) { + List wxBillPropertyPreview = wxPropertyContractService.getWxBillPropertyPreview(propertyContract.getId()); + propertyContract.setPreviewBillRentList(wxBillPropertyPreview); + data.put("property", propertyContract); + } } return new ResultData(data); }