Commit 6bcf3739 authored by qinhu's avatar qinhu

逻辑分页-修改

parent f1aea923
...@@ -21,7 +21,7 @@ public class PageQuery implements Serializable { ...@@ -21,7 +21,7 @@ public class PageQuery implements Serializable {
private static final long serialVersionUID = 3979320797076183357L; private static final long serialVersionUID = 3979320797076183357L;
@ApiModelProperty(value = "当前所在页码") @ApiModelProperty(value = "当前所在页码")
@NonNull @NonNull
private Integer pageNo = 0; private Integer pageNo = 1;
@ApiModelProperty(value = "每页显示数量") @ApiModelProperty(value = "每页显示数量")
@NonNull @NonNull
......
...@@ -242,7 +242,9 @@ public class NormProductionServiceImpl extends ServiceImpl<NormProductionMapper, ...@@ -242,7 +242,9 @@ public class NormProductionServiceImpl extends ServiceImpl<NormProductionMapper,
normProductionDetails(null, start, end); normProductionDetails(null, start, end);
if (normProductionDetails.size() == 0) { if (normProductionDetails.size() == 0) {
return BaseResponse.errorMsg("没找到相关数据!"); BaseResponse<List<NormProductionStatistics>> rts = BaseResponse.errorMsg("没找到相关数据!");
rts.setData(new ArrayList<>());
return rts;
} }
Map<Integer, BigDecimal> coefficientMap = new HashMap<>(normProductionDetails.size()); Map<Integer, BigDecimal> coefficientMap = new HashMap<>(normProductionDetails.size());
...@@ -411,8 +413,9 @@ public class NormProductionServiceImpl extends ServiceImpl<NormProductionMapper, ...@@ -411,8 +413,9 @@ public class NormProductionServiceImpl extends ServiceImpl<NormProductionMapper,
List<SysUser> users = iSysUserService.list(qw); List<SysUser> users = iSysUserService.list(qw);
List<SysPost> sysPosts = iSysPostService.list(); List<SysPost> sysPosts = iSysPostService.list();
Date finalStartDate = startDate; Date finalStartDate = startDate;
Date finalEndDate = endDate;
rts.forEach(arg -> { rts.forEach(arg -> {
arg.setTime(finalStartDate == null ? "" : finalStartDate.toString() + " — " + end.toString()); arg.setTime(finalStartDate == null ? "--" + finalEndDate.toString() : finalStartDate.toString() + "--" + finalEndDate.toString());
if (StrUtil.isBlank(arg.getUserName())) { if (StrUtil.isBlank(arg.getUserName())) {
//关联用户信息 //关联用户信息
users.stream().filter(opt -> arg.getUserId().equals(opt.getId() + "")).findFirst() users.stream().filter(opt -> arg.getUserId().equals(opt.getId() + "")).findFirst()
......
...@@ -13,13 +13,16 @@ import java.util.List; ...@@ -13,13 +13,16 @@ import java.util.List;
public class PageUtil { public class PageUtil {
public static <T> Page<T> listConvertToPage(List<T> list, PageQuery pageQuery) { public static <T> Page<T> listConvertToPage(List<T> list, PageQuery pageQuery) {
int start = pageQuery.getPageNo(); int start = pageQuery.getPageNo() > 0 ? pageQuery.getPageNo() : 1;
int end = Math.min((start + pageQuery.getPageSize()), list.size()); int pageSize = pageQuery.getPageSize() > 0 ? pageQuery.getPageSize() : 10;
Page<T> page = new Page<>(start, pageQuery.getPageSize(), list.size()); int end = Math.min((start * pageSize), list.size());
if (start * page.getSize() > list.size()) { long pageStart = (start - 1) * pageSize;
Page<T> page = new Page<>(start, pageSize, list.size());
if (pageStart >= list.size()) {
return page; return page;
} }
page.setRecords(list.subList((int)(start * page.getSize()), end));
page.setRecords(list.subList((int) (pageStart), end));
return page; return page;
} }
} }
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