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

Merge remote-tracking branch 'origin/dev_20230828_RXWIN' into dev_20230828_RXWIN

Browse Source
This commit is contained in:
zyx.net
2023-08-29 11:41:00 +08:00
parent 27fcf3f1f8 283fb2e130
commit 879420b3e5
1 changed files with 7 additions and 1 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/service/impl/ProjectRxswinEOServiceImpl.java
+7 -1
View File
@@ -138,6 +138,10 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl<ProjectRxswinEOMappe
@Override @Override
public List<ProjectRxswinEO> getPageInfo(ProjectRxswinEO projectRxswinEO) { public List<ProjectRxswinEO> getPageInfo(ProjectRxswinEO projectRxswinEO) {
LambdaQueryWrapper<ProjectRxswinEO> wrapper =new LambdaQueryWrapper<>(); LambdaQueryWrapper<ProjectRxswinEO> wrapper =new LambdaQueryWrapper<>();
if(StringUtils.isBlank(projectRxswinEO.getProjectId())){
return new ArrayList<>();
}
wrapper.eq(ProjectRxswinEO::getProjectId,projectRxswinEO.getProjectId());
if(StringUtils.isNotBlank(projectRxswinEO.getTheme())){ if(StringUtils.isNotBlank(projectRxswinEO.getTheme())){
wrapper.like(ProjectRxswinEO::getTheme,projectRxswinEO.getTheme()); wrapper.like(ProjectRxswinEO::getTheme,projectRxswinEO.getTheme());
@@ -366,7 +370,9 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl<ProjectRxswinEOMappe
LambdaQueryWrapper<ProjectRxswinEO> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ProjectRxswinEO> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ProjectRxswinEO::getProjectId,projectId); wrapper.eq(ProjectRxswinEO::getProjectId,projectId);
List<ProjectRxswinEO> rxswinEOList = this.list(wrapper); List<ProjectRxswinEO> rxswinEOList = this.list(wrapper);
List<String> versionList = rxswinEOList.stream().map(ProjectRxswinEO::getVersion).distinct().collect(Collectors.toList()); List<String> versionList = rxswinEOList.stream()
.filter(e->StringUtils.isNotBlank(e.getVersion()))
.map(ProjectRxswinEO::getVersion).distinct().collect(Collectors.toList());
Collections.sort(versionList,(a,b)->{ Collections.sort(versionList,(a,b)->{
return Integer.parseInt(a) - Integer.parseInt(b); return Integer.parseInt(a) - Integer.parseInt(b);
}); });