From 0cac3f92bddfb159122313d9c0f139c3f41c749f Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 17 Jun 2019 14:26:55 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A7=9F=E8=B5=81=E7=89=A9=E4=B8=9A=E5=90=88?= =?UTF-8?q?=E5=90=8C][=E4=BF=AE=E6=94=B9][=E5=90=88=E5=90=8C=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxRentPropertyContractController.java | 9 +++++++++ .../service/WxRentPropertyContractService.java | 2 ++ .../impl/WxRentPropertyContractServiceImpl.java | 17 +++++++++++++++++ 3 files changed, 28 insertions(+) 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;