From 2727a24958b8b939a23d998987d2cbb9131d8cda Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 20 Dec 2018 12:15:05 +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 --- .../src/main/java/com/iformall/domain/po/WxCardSpend.java | 4 ++++ .../src/main/java/com/iformall/domain/vo/WxCardVo.java | 6 ++++++ .../src/main/resources/mapper/WxCardInfoMapper.xml | 8 +++++++- .../src/main/resources/mapper/WxCardSpendMapper.xml | 8 +++++++- 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java index b0070fa73..fb5c2da81 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java @@ -67,7 +67,11 @@ public class WxCardSpend 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/java/com/iformall/domain/vo/WxCardVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java index 8ac258612..2d7068bd3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java @@ -74,4 +74,10 @@ public class WxCardVo extends WxCardInfo { @Transient protected String statusStr; + + @Transient + private Date startdate; + + @Transient + private Date enddate; } diff --git a/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml index 7004b116c..9b78c56a0 100644 --- a/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml @@ -57,7 +57,10 @@ and `update_date` = #{updateDate} - + + + and `create_date` between #{startdate} and #{enddate} + and id in @@ -158,6 +161,9 @@ and o_phone = #{oPhone} + + and ci.`create_date` between #{startdate} and #{enddate} + and status in diff --git a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml index e26a360a5..f6c6bd8be 100644 --- a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml @@ -70,7 +70,10 @@ and `update_date` = #{updateDate} - + + + and `create_date` between #{startdate} and #{enddate} + and id in @@ -166,6 +169,9 @@ and cs.`update_date` = #{updateDate} + + and cs.`create_date` between #{startdate} and #{enddate} + and cs.id in