| @@ -67,7 +67,11 @@ public class WxCardSpend implements Serializable { | |||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | ||||
| private Date updateDate; | private Date updateDate; | ||||
| @Transient | |||||
| private Date startdate; | |||||
| @Transient | |||||
| private Date enddate; | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| @@ -74,4 +74,10 @@ public class WxCardVo extends WxCardInfo { | |||||
| @Transient | @Transient | ||||
| protected String statusStr; | protected String statusStr; | ||||
| @Transient | |||||
| private Date startdate; | |||||
| @Transient | |||||
| private Date enddate; | |||||
| } | } | ||||
| @@ -57,7 +57,10 @@ | |||||
| </if> | </if> | ||||
| <if test=" null != updateDate "> | <if test=" null != updateDate "> | ||||
| and `update_date` = #{updateDate} | and `update_date` = #{updateDate} | ||||
| </if> | |||||
| </if> | |||||
| <if test=" null != startdate and null!=enddate"> | |||||
| and `create_date` between #{startdate} and #{enddate} | |||||
| </if> | |||||
| <if test=" null != ids "> | <if test=" null != ids "> | ||||
| and id in | and id in | ||||
| <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> | <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> | ||||
| @@ -158,6 +161,9 @@ | |||||
| <if test=" null != oPhone "> | <if test=" null != oPhone "> | ||||
| and o_phone = #{oPhone} | and o_phone = #{oPhone} | ||||
| </if> | </if> | ||||
| <if test=" null != startdate and null!=enddate"> | |||||
| and ci.`create_date` between #{startdate} and #{enddate} | |||||
| </if> | |||||
| <if test=" null != statusS "> | <if test=" null != statusS "> | ||||
| and status in | and status in | ||||
| <foreach collection="statusS" index="index" item="sItem" open="(" separator="," close=")"> | <foreach collection="statusS" index="index" item="sItem" open="(" separator="," close=")"> | ||||
| @@ -70,7 +70,10 @@ | |||||
| </if> | </if> | ||||
| <if test=" null != updateDate "> | <if test=" null != updateDate "> | ||||
| and `update_date` = #{updateDate} | and `update_date` = #{updateDate} | ||||
| </if> | |||||
| </if> | |||||
| <if test=" null != startdate and null!=enddate"> | |||||
| and `create_date` between #{startdate} and #{enddate} | |||||
| </if> | |||||
| <if test=" null != ids "> | <if test=" null != ids "> | ||||
| and id in | and id in | ||||
| <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> | <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> | ||||
| @@ -166,6 +169,9 @@ | |||||
| <if test=" null != updateDate "> | <if test=" null != updateDate "> | ||||
| and cs.`update_date` = #{updateDate} | and cs.`update_date` = #{updateDate} | ||||
| </if> | </if> | ||||
| <if test=" null != startdate and null!=enddate"> | |||||
| and cs.`create_date` between #{startdate} and #{enddate} | |||||
| </if> | |||||
| <if test=" null != ids "> | <if test=" null != ids "> | ||||
| and cs.id in | and cs.id in | ||||
| <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> | <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> | ||||