From 0516e0ff1cb0807f0a6afa533a93cbfd62f9eca9 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 29 Apr 2019 13:08:47 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A7=9F=E8=B5=81=E5=90=88=E5=90=8C][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=88=A4=E6=96=AD=E5=90=88=E5=90=8C?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxRentContractController.java | 8 ++++++++ .../iformall/mapper/WxRentContractMapper.java | 3 +++ .../service/WxRentContractService.java | 3 +++ .../impl/WxRentContractServiceImpl.java | 6 ++++++ .../resources/mapper/WxRentContractMapper.xml | 19 +++++++++++++++++++ 5 files changed, 39 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java index 549fcafb4..4b84471d4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java @@ -215,4 +215,12 @@ public class WxRentContractController extends BaseController { return wxRentContractService.hasRentStatus(wxRentContract); } + @GetMapping("/hasContractNumber") + @SystemControllerLog(description = "租赁合同-检查合同编号是否存在") + public ResultData hasContractNumber(@ModelAttribute WxRentContract wxRentContract) { + logger.debug("[" + getIpAddr() + "] WxRentContractController::hasContractNumber"); + wxRentContract.setTenantId(getTenantId()); + return wxRentContractService.hasContractNumber(wxRentContract); + } + } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java index b731aada9..2772d041b 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java @@ -54,4 +54,7 @@ public interface WxRentContractMapper extends CommonMapper List selectRentContractByMerchantId(WxRentContract wxRentContract); List selectRentContractByShopId(WxRentContract record); + + int hasContractNumber(WxRentContract wxRentContract); + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java index 5b929713c..ed547746b 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java @@ -80,4 +80,7 @@ public interface WxRentContractService { void updateInvalidContract(Long rentContractId); ResultData hasRentStatus(WxRentContract wxRentContract); + + ResultData hasContractNumber(WxRentContract wxRentContract); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index bcb7bb184..76f201643 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -670,6 +670,12 @@ public class WxRentContractServiceImpl implements WxRentContractService { return new ResultData(Result.SUCCESS, "操作成功"); } + @Override + public ResultData hasContractNumber(WxRentContract wxRentContract) { + int count = wxRentContractMapper.hasContractNumber(wxRentContract); + return new ResultData(Result.SUCCESS, "操作成功", count > 0 ? true : false); + } + public void updateInvalidStatus(WxRentContract record) { Long id = record.getId(); //审核流程中止 diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index e43336c0d..3387e44a7 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -252,5 +252,24 @@ where status in(2,3,4) and merchant_id = #{merchantId} + + +