Compare commits
No commits in common. "6b0c58dea9120dca3ad0ca159d0df65d50b4be72" and "3e67b5b94cf4752ac357c27b4c73d8343223bebe" have entirely different histories.
6b0c58dea9
...
3e67b5b94c
@ -2,22 +2,7 @@
|
|||||||
<configuration default="false" name="oa [clean,spring-boot:run]" type="MavenRunConfiguration" factoryName="Maven" nameIsGenerated="true">
|
<configuration default="false" name="oa [clean,spring-boot:run]" type="MavenRunConfiguration" factoryName="Maven" nameIsGenerated="true">
|
||||||
<MavenSettings>
|
<MavenSettings>
|
||||||
<option name="myGeneralSettings" />
|
<option name="myGeneralSettings" />
|
||||||
<option name="myRunnerSettings">
|
<option name="myRunnerSettings" />
|
||||||
<MavenRunnerSettings>
|
|
||||||
<option name="delegateBuildToMaven" value="false" />
|
|
||||||
<option name="environmentProperties">
|
|
||||||
<map />
|
|
||||||
</option>
|
|
||||||
<option name="jreName" value="corretto-17" />
|
|
||||||
<option name="mavenProperties">
|
|
||||||
<map />
|
|
||||||
</option>
|
|
||||||
<option name="passParentEnv" value="true" />
|
|
||||||
<option name="runMavenInBackground" value="true" />
|
|
||||||
<option name="skipTests" value="false" />
|
|
||||||
<option name="vmOptions" value="-Dfile.encoding=GB2312" />
|
|
||||||
</MavenRunnerSettings>
|
|
||||||
</option>
|
|
||||||
<option name="myRunnerParameters">
|
<option name="myRunnerParameters">
|
||||||
<MavenRunnerParameters>
|
<MavenRunnerParameters>
|
||||||
<option name="cmdOptions" />
|
<option name="cmdOptions" />
|
||||||
|
@ -1,17 +0,0 @@
|
|||||||
package com.jsl.oa.model.vodata;
|
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@AllArgsConstructor
|
|
||||||
@NoArgsConstructor
|
|
||||||
public class PageBean<T> {
|
|
||||||
private int totalCount; // 总记录数
|
|
||||||
private int currentPage; // 当前页码
|
|
||||||
private int pageSize; // 每页记录数
|
|
||||||
private List<T> list; // 当前页的数据列表
|
|
||||||
}
|
|
@ -7,7 +7,6 @@ import com.jsl.oa.model.dodata.ProjectChildDO;
|
|||||||
import com.jsl.oa.model.dodata.ProjectModuleDO;
|
import com.jsl.oa.model.dodata.ProjectModuleDO;
|
||||||
import com.jsl.oa.model.vodata.MessageAddVO;
|
import com.jsl.oa.model.vodata.MessageAddVO;
|
||||||
import com.jsl.oa.model.vodata.MessageGetVO;
|
import com.jsl.oa.model.vodata.MessageGetVO;
|
||||||
import com.jsl.oa.model.vodata.PageBean;
|
|
||||||
import com.jsl.oa.services.MessageService;
|
import com.jsl.oa.services.MessageService;
|
||||||
import com.jsl.oa.utils.*;
|
import com.jsl.oa.utils.*;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
@ -87,18 +86,12 @@ public class MessageServiceImpl implements MessageService {
|
|||||||
}
|
}
|
||||||
messageGetVOList.add(messageGetVO1);
|
messageGetVOList.add(messageGetVO1);
|
||||||
}
|
}
|
||||||
|
|
||||||
//分页返回
|
//分页返回
|
||||||
int start = (page - 1) * pageSize;
|
int start = (page - 1) * pageSize;
|
||||||
int end = start + pageSize;
|
int end = start + pageSize;
|
||||||
List<MessageGetVO> pageData = messageGetVOList.subList(start,
|
List<MessageGetVO> pageData = messageGetVOList.subList(start,
|
||||||
Math.min(end, messageGetVOList.size()));
|
Math.min(end, messageGetVOList.size()));
|
||||||
PageBean<MessageGetVO> pageBean = new PageBean<>();
|
return ResultUtil.success(pageData);
|
||||||
pageBean.setTotalCount(messageGetVOList.size());
|
|
||||||
pageBean.setCurrentPage(page);
|
|
||||||
pageBean.setPageSize(pageSize);
|
|
||||||
pageBean.setList(pageData);
|
|
||||||
return ResultUtil.success(pageBean);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
x
Reference in New Issue
Block a user