diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/MallUserActionVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/MallUserActionVo.java index d461d8289..43631f7b4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/MallUserActionVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/MallUserActionVo.java @@ -5,10 +5,11 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; +import javax.persistence.Transient; import java.util.Date; /** - * Created by syf on 2018/8/30. + * Created by Stormeye on 2019/06/17. */ @Data @ToString(callSuper = true) @@ -20,6 +21,14 @@ public class MallUserActionVo extends MallUserAction { @io.swagger.annotations.ApiModelProperty(value="用户名称",name="name") private String name; + @Transient + @io.swagger.annotations.ApiModelProperty(value="查询-开始时间",name="startdate") + private Date startdate; + + @Transient + @io.swagger.annotations.ApiModelProperty(value="查询-结束时间",name="enddate") + private Date enddate; + public static enum Field { Id_ASC("mua.`id` ASC"),Id_DESC("mua.`id` DESC") diff --git a/mallinkService/src/main/resources/mapper/MallUserActionMapper.xml b/mallinkService/src/main/resources/mapper/MallUserActionMapper.xml index 358e54ece..a473e6887 100644 --- a/mallinkService/src/main/resources/mapper/MallUserActionMapper.xml +++ b/mallinkService/src/main/resources/mapper/MallUserActionMapper.xml @@ -86,6 +86,9 @@ and mua.`action_time` = #{actionTime} + + and mua.`action_time` between #{startdate} and #{enddate} + and mua.id in