From 347783b1222229d3fcd32d1be0f70373faec7ac3 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 12 Nov 2018 15:19:05 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=B0=86=E5=88=B0=E6=9C=9F=E6=95=B0=E6=8D=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxPropertyContractServiceImpl.java | 6 +++--- .../src/main/resources/mapper/WxPropertyContractMapper.xml | 4 ++-- .../src/main/resources/mapper/WxRentContractMapper.xml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) 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 cd23a6225..7914d8b71 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -88,9 +88,9 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService } //关联的店铺 if (wxPropertyContract.getShopId() != null) { - List list = new ArrayList<>(); - WxShop wxShop = wxShopMapper.selectByPrimaryKey(wxPropertyContract.getShopId()); - list.add(wxShop); + WxShop record = new WxShop(); + record.setId(wxPropertyContract.getShopId()); + List> list = wxShopMapper.findListMap(record); result.put("wxShops", list); } else { result.put("wxShops", Collections.EMPTY_LIST); diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index 18db1a140..c84b0767f 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -113,7 +113,7 @@ - update wx_property_contract set status=#{status} where tenant_id=#{tenantId} and status!=1 and status!=6 and status!=7 and DATEDIFF(rental_end_date,now()) <= 30 + update wx_property_contract set status=#{status} where tenant_id=#{tenantId} and status!=1 and status!=6 and status!=7 and DATEDIFF(rental_end_date,now()) <= 30 and rental_end_date > now() diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 5b67acc55..529e1e0b7 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -105,7 +105,7 @@ - update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} and status!=1 and status!=6 and status!=7 and DATEDIFF(rental_end_date,now()) <= 30 + update wx_rent_contract set status=#{status} where tenant_id=#{tenantId} and status!=1 and status!=6 and status!=7 and DATEDIFF(rental_end_date,now()) <= 30 and rental_end_date > now()