From 8488496e508c7a5cbafd3c21c630f95b2ac15ce8 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 20 Dec 2018 12:35:04 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=82=A8=E5=80=BC=E5=8D=A1][=E6=96=B0?= =?UTF-8?q?=E5=A2=9E]:=E6=B7=BB=E5=8A=A0=E5=BC=80=E5=A7=8B=E6=97=B6?= =?UTF-8?q?=E9=97=B4/=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=E4=BF=9D?= =?UTF-8?q?=E8=AF=81=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/domain/po/WxMerchantSubsidy.java | 4 ++++ .../src/main/resources/mapper/WxMerchantSubsidyMapper.xml | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java index 132b07a58..0f128616b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java @@ -64,7 +64,11 @@ public class WxMerchantSubsidy implements Serializable { @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; + @Transient + private Date startdate; + @Transient + private Date enddate; public static enum Field { diff --git a/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml index 12d95631f..9ad125b6d 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml @@ -65,7 +65,10 @@ and `update_date` = #{updateDate} - + + + and `create_date` between #{startdate} and #{enddate} + and id in @@ -157,6 +160,9 @@ and ms.`update_date` = #{updateDate} + + and ms.`create_date` between #{startdate} and #{enddate} + and id in