Commit aa2d9714 authored by Smile's avatar Smile

会员等级配置查询修改等级和状态多选

parent 3a20eb49
...@@ -60,11 +60,11 @@ public class MemberUserLevelConfigServiceImpl extends AbstractService<MemberUser ...@@ -60,11 +60,11 @@ public class MemberUserLevelConfigServiceImpl extends AbstractService<MemberUser
if (query.getName() != null){ if (query.getName() != null){
wrapper.like(MemberUserLevelConfigDO::getName, query.getName()); wrapper.like(MemberUserLevelConfigDO::getName, query.getName());
} }
if (query.getStatus() != null){ if (query.getStatus() != null && !query.getStatus().isEmpty()){
wrapper.eq(MemberUserLevelConfigDO::getStatus, query.getStatus()); wrapper.in(MemberUserLevelConfigDO::getStatus, query.getStatus());
} }
if (query.getLevel() != null){ if (query.getLevel() != null && !query.getLevel().isEmpty()){
wrapper.eq(MemberUserLevelConfigDO::getLevel, query.getLevel()); wrapper.in(MemberUserLevelConfigDO::getLevel, query.getLevel());
} }
if (query.getBeginTime() != null&& query.getEndTime() != null){ if (query.getBeginTime() != null&& query.getEndTime() != null){
wrapper.between(MemberUserLevelConfigDO::getEnableDate, query.getBeginTime(), query.getEndTime()); wrapper.between(MemberUserLevelConfigDO::getEnableDate, query.getBeginTime(), query.getEndTime());
......
...@@ -7,6 +7,7 @@ import lombok.Data; ...@@ -7,6 +7,7 @@ import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date; import java.util.Date;
import java.util.List;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
...@@ -29,13 +30,13 @@ public class MemberUserLevelConfigReqVO extends PageParam { ...@@ -29,13 +30,13 @@ public class MemberUserLevelConfigReqVO extends PageParam {
* 等级(字典配置) * 等级(字典配置)
*/ */
@ApiModelProperty(value = "等级") @ApiModelProperty(value = "等级")
private Integer level; private List<Integer> level;
/** /**
* 状态(0.未发布,1.已启用,2.已禁用,3.已过期) * 状态(0.未发布,1.已启用,2.已禁用,3.已过期)
*/ */
@ApiModelProperty(value = "状态") @ApiModelProperty(value = "状态")
private Integer status; private List<Integer> status;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment