From 70f67f9aea2cca465b5118db434a4611a7035ede Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 10 Apr 2019 18:09:17 +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][=E9=80=89=E6=8B=A9=E5=95=86=E6=88=B7?= =?UTF-8?q?=E5=88=97=E8=A1=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/WxPropertyContractMapper.java | 4 +++- .../impl/WxPropertyContractServiceImpl.java | 7 ++++++- .../mapper/WxPropertyContractMapper.xml | 17 ++++++++++++++--- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxPropertyContractMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxPropertyContractMapper.java index 25b866896..158fb06e9 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxPropertyContractMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxPropertyContractMapper.java @@ -34,7 +34,9 @@ public interface WxPropertyContractMapper extends CommonMapper getRentContractList(Map params); + List getRentContractListByShop(Map params); + + List getRentContractListByPoint(Map params); void updateApplyStatus(WxPropertyContract wxPropertyContract); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 86e8bf982..44cf1ed85 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -684,7 +684,12 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService Map params = new HashMap<>(); params.put("tenantId", record.getTenantId()); params.put("rentShopType", record.getRentShopType()); - List contractList = wxPropertyContractMapper.getRentContractList(params); + List contractList; + if (record.getRentShopType().equals(EnumRentShopType.SHOP.getCode())) { + contractList = wxPropertyContractMapper.getRentContractListByShop(params); + } else { + contractList = wxPropertyContractMapper.getRentContractListByPoint(params); + } return contractList; } diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index 2b00b336b..af370fdb4 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -175,15 +175,26 @@ )s) and merchant_id is null and tenant_id=#{tenantId} - + select rc.* from wx_rent_contract rc where rc.status not in(0,1,5,6,7) and rc.tenant_id=#{tenantId} and rc.id not in (select pc.rent_contract_id from ( select rent_contract_id from wx_property_contract where status not in(5,6,7) and tenant_id=#{tenantId} ) pc) and rent_shop_type = #{rentShopType} - + + + + update wx_property_contract set apply_status=#{applyStatus} ,business_type=#{businessType}