From 7decd13b3dc76562f7f881f11ec9e7e5c4af0a0b Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 26 Oct 2018 14:08:36 +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][=E6=9F=A5=E8=AF=A2=E5=85=B3=E8=81=94?= =?UTF-8?q?=E7=A7=9F=E8=B5=81=E5=90=88=E5=90=8C=E7=9A=84=E5=BA=97=E9=93=BA?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/mapper/WxPropertyContractMapper.java | 2 +- .../iformall/service/impl/WxPropertyContractServiceImpl.java | 5 +++-- .../src/main/resources/mapper/WxPropertyContractMapper.xml | 4 ++-- 3 files changed, 6 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 2cf9a8221..6d744a394 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxPropertyContractMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxPropertyContractMapper.java @@ -34,7 +34,7 @@ public interface WxPropertyContractMapper extends CommonMapper getRentContractList(String tenantId); + List getRentContractList(Map params); 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 b0c5d3dc4..c731e6fad 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -355,8 +355,9 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService @Override public Object getRentContractList(String tenantId) { - - return wxPropertyContractMapper.getRentContractList(tenantId); + Map params =new HashMap<>(); + params.put("tenantId",tenantId); + return wxPropertyContractMapper.getRentContractList(params); } public Map updateStatus(String tenantId) { diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index 8f0f0202d..b9f157202 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -144,10 +144,10 @@ )s) and merchant_id is null and tenant_id=#{tenantId} - select rc.*,s.shop_number from wx_rent_contract rc left join wx_shop s on rc.shop_id=s.id where rc.status not in(1,6,7) and rc.tenant_id=#{tenantId} - and rc.id not in (select pc.rent_contract_id form ( + and rc.id not in (select pc.rent_contract_id from ( select rent_contract_id from wx_property_contract where status not in(1,6,7) and tenant_id=#{tenantId} ) pc)