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 ced485fea..ab9f2b1fb 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java @@ -51,6 +51,15 @@ public class WxRentPropertyContractController extends BaseController { return wxRentPropertyContractService.getContractInfo(id); } + @ApiOperation("合同审批详情") + @GetMapping("/getContractApplyInfo") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + @SystemControllerLog(description = "租赁物业合同-合同审批详情") + public ResultData getContractApplyInfo(Long id) { + logger.debug("[" + getIpAddr() + "] wxRentPropertyContract::getContractApplyInfo"); + return wxRentPropertyContractService.getContractApplyInfo(id); + } + @PostMapping("insertRentForCreate") @SystemControllerLog(description = "租赁合同-添加") public ResultData insertRent(@RequestBody WxRentContract wxRentContract) { diff --git a/mallinkService/src/main/java/com/iformall/service/WxRentPropertyContractService.java b/mallinkService/src/main/java/com/iformall/service/WxRentPropertyContractService.java index 87af04277..25328a067 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxRentPropertyContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxRentPropertyContractService.java @@ -14,6 +14,8 @@ public interface WxRentPropertyContractService { ResultData getContractInfo(Long id); + ResultData getContractApplyInfo(Long id); + ResultData insertRentForCreate(WxRentContract wxRentContract); } 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 8e722476b..583030053 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java @@ -55,6 +55,23 @@ public class WxRentPropertyContractServiceImpl implements WxRentPropertyContract return new ResultData(data); } + + @Override + public ResultData getContractApplyInfo(Long id) { + Map data = new HashMap<>(2); + Map rent = wxRentContractService.getById(id); + data.put("rent", rent); + WxPropertyContract wxPropertyContractQuery = new WxPropertyContract(); + wxPropertyContractQuery.setRentContractId(id); + WxPropertyContract propertyContract = wxPropertyContractMapper.selectOne(wxPropertyContractQuery); + if (propertyContract != null) { + Map property = wxPropertyContractService.getById(propertyContract.getId()); + data.put("property", property); + } + return new ResultData(data); + } + + @Override public ResultData insertRentForCreate(WxRentContract wxRentContract) { return null;