记得上下班打卡 | git大法好,push需谨慎

Commit e4daae26 authored by GaoHu's avatar GaoHu

exit

parent fc811e58
...@@ -27,10 +27,10 @@ public class GoblinGoodsAnticipateValueParam{ ...@@ -27,10 +27,10 @@ public class GoblinGoodsAnticipateValueParam{
@Min(value = 1, message = "起始索引无效") @Min(value = 1, message = "起始索引无效")
@NotNull(message = "起始索引无效") @NotNull(message = "起始索引无效")
private Integer pageNum; private Integer pageNum;
@ApiModelProperty(position = 12, required = true, value = "每页显示记录数", example = "20") // @ApiModelProperty(position = 12, required = true, value = "每页显示记录数", example = "20")
@Max(value = 100, message = "显示记录数无效") // @Max(value = 100, message = "显示记录数无效")
@NotNull(message = "显示记录数无效") // @NotNull(message = "显示记录数无效")
private Integer pageSize; // private Integer pageSize;
/** /**
* 预约名称 * 预约名称
......
...@@ -59,7 +59,7 @@ public class GoblinMongoUtils { ...@@ -59,7 +59,7 @@ public class GoblinMongoUtils {
*/ */
public HashMap<String, Object> getGoblinGoodsAnticipateValueVos(GoblinGoodsAnticipateValueParam goblinGoodsAnticipateValueParam) { public HashMap<String, Object> getGoblinGoodsAnticipateValueVos(GoblinGoodsAnticipateValueParam goblinGoodsAnticipateValueParam) {
HashMap<String, Object> info = CollectionUtil.mapStringObject(); HashMap<String, Object> info = CollectionUtil.mapStringObject();
Pageable pageable = PageRequest.of(goblinGoodsAnticipateValueParam.getPageNum() - 1, goblinGoodsAnticipateValueParam.getPageSize(), Sort.by(Sort.Direction.DESC, "createdDate")); Pageable pageable = PageRequest.of(goblinGoodsAnticipateValueParam.getPageNum() - 1, 20, Sort.by(Sort.Direction.DESC, "createdDate"));
Criteria criteria = Criteria.where("delTag").is(0); Criteria criteria = Criteria.where("delTag").is(0);
if (StringUtils.isNotBlank(goblinGoodsAnticipateValueParam.getName())) { if (StringUtils.isNotBlank(goblinGoodsAnticipateValueParam.getName())) {
criteria = criteria.and("skuName").is(goblinGoodsAnticipateValueParam.getName()); criteria = criteria.and("skuName").is(goblinGoodsAnticipateValueParam.getName());
......
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