| @@ -51,6 +51,15 @@ public class WxRentPropertyContractController extends BaseController { | |||||
| return wxRentPropertyContractService.getContractInfo(id); | 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") | @PostMapping("insertRentForCreate") | ||||
| @SystemControllerLog(description = "租赁合同-添加") | @SystemControllerLog(description = "租赁合同-添加") | ||||
| public ResultData insertRent(@RequestBody WxRentContract wxRentContract) { | public ResultData insertRent(@RequestBody WxRentContract wxRentContract) { | ||||
| @@ -14,6 +14,8 @@ public interface WxRentPropertyContractService { | |||||
| ResultData getContractInfo(Long id); | ResultData getContractInfo(Long id); | ||||
| ResultData getContractApplyInfo(Long id); | |||||
| ResultData insertRentForCreate(WxRentContract wxRentContract); | ResultData insertRentForCreate(WxRentContract wxRentContract); | ||||
| } | } | ||||
| @@ -55,6 +55,23 @@ public class WxRentPropertyContractServiceImpl implements WxRentPropertyContract | |||||
| return new ResultData(data); | return new ResultData(data); | ||||
| } | } | ||||
| @Override | |||||
| public ResultData getContractApplyInfo(Long id) { | |||||
| Map<String, Object> data = new HashMap<>(2); | |||||
| Map<String, Object> rent = wxRentContractService.getById(id); | |||||
| data.put("rent", rent); | |||||
| WxPropertyContract wxPropertyContractQuery = new WxPropertyContract(); | |||||
| wxPropertyContractQuery.setRentContractId(id); | |||||
| WxPropertyContract propertyContract = wxPropertyContractMapper.selectOne(wxPropertyContractQuery); | |||||
| if (propertyContract != null) { | |||||
| Map<String, Object> property = wxPropertyContractService.getById(propertyContract.getId()); | |||||
| data.put("property", property); | |||||
| } | |||||
| return new ResultData(data); | |||||
| } | |||||
| @Override | @Override | ||||
| public ResultData insertRentForCreate(WxRentContract wxRentContract) { | public ResultData insertRentForCreate(WxRentContract wxRentContract) { | ||||
| return null; | return null; | ||||