From c6b4c3ca89958a92cd04808052f117151a0063d9 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 25 Oct 2018 16:40:45 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=89=A9=E4=B8=9A=E5=90=88=E5=90=8C][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=BF=AE=E6=94=B9=E8=AE=BF=E9=97=AE?= =?UTF-8?q?=E6=96=B9=E6=B3=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/WxPropertyContractController.java | 6 +++--- .../src/main/resources/mapper/WxPropertyContractMapper.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxPropertyContractController.java index 3b9419247..f4bb7861d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxPropertyContractController.java @@ -69,12 +69,12 @@ public class WxPropertyContractController extends BaseController wxPropertyContractService.download(request,response,getTenantId()); } - @GetMapping("/getRentContractStatusInfo") - public ResultData getRentContractStatusInfo() { + @GetMapping("/getPropertyContractStatusInfo") + public ResultData getPropertyContractStatusInfo() { return new ResultData(Result.SUCCESS, "查询成功", wxPropertyContractService.getRentContractStatusInfo(getTenantId())); } - @GetMapping("/endRentContract") + @GetMapping("/endPropertyContract") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData endRentContract(Long id) { return wxPropertyContractService.endRentContract(id); diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index a6a756849..944a473f0 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -80,7 +80,7 @@ - select rc.id,rc.merchant_name merchantName,rc.rental_start_date rentalStartDate,rc.rental_end_date rentalEndDate,rc.`status`, rc.price,rc.contract_number contractNumber,s.shop_number shopNumber,f.floor_name floorName,b.building_name buildingName, rc.lease,rc.filepath,rc.filename,rc.pay_account payAccount,rc.sign_date signDate