From 39b8d8511e6702800ab40d60aaffacb91dfbd89e Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 28 Aug 2023 18:06:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProjectRxswinEOController.java | 3 +- .../project/entity/ProjectRxswinEO.java | 4 ++ .../service/IProjectRxswinEOService.java | 2 + .../impl/ProjectRxswinEOServiceImpl.java | 46 +++++++++++++++++++ 4 files changed, 53 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java index 99f9f7159..1a1978c0c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java @@ -63,8 +63,7 @@ public class ProjectRxswinEOController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(projectRxswinEO, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = projectRxswinEOService.page(page, queryWrapper); + IPage pageList = projectRxswinEOService.getPageInfo(pageNo,pageSize, projectRxswinEO); return Result.OK(pageList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEO.java index 064d5804c..6722e3428 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEO.java @@ -93,4 +93,8 @@ public class ProjectRxswinEO implements Serializable { @ApiModelProperty(value = "中英文切换") private String cut; + @TableField(exist = false) + @ApiModelProperty(value = "编号") + private String serialNumber; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java index 382ed1de4..f777c2dad 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java @@ -62,6 +62,8 @@ public interface IProjectRxswinEOService extends IService { */ List queryList(); + Page getPageInfo(Integer pageNo,Integer pageSize,ProjectRxswinEO projectRxswinEO); + /** * 调取--第一层 * @param pageNo diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java index 293c89d4b..2b708c2ed 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java @@ -7,11 +7,14 @@ import com.jero.common.constant.enums.CutEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.PageUtil; +import com.jero.modules.document.entity.BussDocumentLibraryEO; +import com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl; import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectRxswinEO; import com.jero.modules.project.enums.StatusEnum; import com.jero.modules.project.mapper.ProjectRxswinEOMapper; import com.jero.modules.project.service.IProjectRxswinEOService; +import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -34,6 +37,8 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl getPageInfo(Integer pageNo,Integer pageSize, ProjectRxswinEO projectRxswinEO) { + LambdaQueryWrapper wrapper =new LambdaQueryWrapper<>(); + + 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 projectRxswinEOList = this.list(wrapper); + + if(!projectRxswinEOList.isEmpty()){ + List documentIdList = projectRxswinEOList.stream().map(ProjectRxswinEO::getDocumentId).distinct().collect(Collectors.toList()); + List bussDocumentLibraryEOList = getBussDocumentLibraryEOList(documentIdList); + for (ProjectRxswinEO projectRxswinEOTemp : projectRxswinEOList) { + List 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); + } + /** * 调取--第一层 * @param pageNo @@ -278,4 +317,11 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl getBussDocumentLibraryEOList(List documentIdList){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(BussDocumentLibraryEO::getId,documentIdList); + return bussDocumentLibraryEOService.list(wrapper); + } }