WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

分页查询

Browse Source
This commit is contained in:
zhn
2023-08-29 09:22:53 +08:00
parent 39b8d8511e
commit 5a212a54f3
3 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java
+1 -2
View File
@@ -212,8 +212,7 @@ public class ProjectRxswinEOController extends JeroController<ProjectRxswinEO, I
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
Page<ProjectRxswinEO> page = new Page<ProjectRxswinEO>(pageNo, pageSize); IPage<ProjectRxswinEO> pageList = projectRxswinEOService.getTwoPage(pageNo,pageSize,projectRxswinEO);
IPage<ProjectRxswinEO> pageList = projectRxswinEOService.getTwoPage(page,projectRxswinEO);
return Result.OK(pageList); return Result.OK(pageList);
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java
+3 -2
View File
@@ -75,11 +75,12 @@ public interface IProjectRxswinEOService extends IService<ProjectRxswinEO> {
/** /**
* 调取--第二层 * 调取--第二层
* @param page * @param pageNo
* @param pageSize
* @param projectRxswinEO * @param projectRxswinEO
* @return * @return
*/ */
Page<ProjectRxswinEO> getTwoPage(Page<ProjectRxswinEO> page,ProjectRxswinEO projectRxswinEO); Page<ProjectRxswinEO> getTwoPage(Integer pageNo,Integer pageSize,ProjectRxswinEO projectRxswinEO);
/** /**
* 提交 * 提交
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java
+34 -5
View File
@@ -190,17 +190,46 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl<ProjectRxswinEOMappe
/** /**
* 调取--第二层 * 调取--第二层
* @param page * @param pageNo
* @param pageSize
* @param projectRxswinEO * @param projectRxswinEO
* @return * @return
*/ */
@Override @Override
public Page<ProjectRxswinEO> getTwoPage(Page<ProjectRxswinEO> page,ProjectRxswinEO projectRxswinEO) { public Page<ProjectRxswinEO> getTwoPage(Integer pageNo,Integer pageSize,ProjectRxswinEO projectRxswinEO) {
LambdaQueryWrapper<ProjectRxswinEO> wrapper = new LambdaQueryWrapper<>();
LambdaQueryWrapper<ProjectRxswinEO> wrapper =new LambdaQueryWrapper<>();
wrapper.eq(ProjectRxswinEO::getProjectId,projectRxswinEO.getProjectId()); wrapper.eq(ProjectRxswinEO::getProjectId,projectRxswinEO.getProjectId());
wrapper.eq(ProjectRxswinEO::getState, StatusEnum.SUBMIT.getValue());//提交的 wrapper.eq(ProjectRxswinEO::getState, StatusEnum.SUBMIT.getValue());//提交的
this.page(page,wrapper);
return this.page(page,wrapper); if(StringUtils.isNotBlank(projectRxswinEO.getTheme())){
wrapper.like(ProjectRxswinEO::getTheme,projectRxswinEO.getTheme());
}
if(StringUtils.isNotBlank(projectRxswinEO.getVersion())){
wrapper.eq(ProjectRxswinEO::getVersion,projectRxswinEO.getVersion());
}
if(StringUtils.isNotBlank(projectRxswinEO.getRxswin())){
wrapper.like(ProjectRxswinEO::getRxswin,projectRxswinEO.getRxswin());
}
List<ProjectRxswinEO> projectRxswinEOList = this.list(wrapper);
if(!projectRxswinEOList.isEmpty()){
List<String> documentIdList = projectRxswinEOList.stream().map(ProjectRxswinEO::getDocumentId).distinct().collect(Collectors.toList());
List<BussDocumentLibraryEO> bussDocumentLibraryEOList = getBussDocumentLibraryEOList(documentIdList);
for (ProjectRxswinEO projectRxswinEOTemp : projectRxswinEOList) {
List<BussDocumentLibraryEO> collect = bussDocumentLibraryEOList.stream()
.filter(e -> e.getId().equals(projectRxswinEOTemp.getDocumentId())).collect(Collectors.toList());
if(!collect.isEmpty()){
projectRxswinEOTemp.setSerialNumber(collect.get(0).getSerialNumber());
}
}
if(StringUtils.isNotBlank(projectRxswinEO.getSerialNumber())){
projectRxswinEOList = projectRxswinEOList.stream()
.filter(e -> e.getSerialNumber().contains(projectRxswinEO.getSerialNumber())).collect(Collectors.toList());
}
}
return PageUtil.getPages(pageNo,pageSize,projectRxswinEOList);
} }
/** /**