From 5a212a54f3a45005042d67bbfab8907b8470bf6c Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 29 Aug 2023 09:22:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ProjectRxswinEOController.java |  3 +-
 .../service/IProjectRxswinEOService.java      |  5 ++-
 .../impl/ProjectRxswinEOServiceImpl.java      | 39 ++++++++++++++++---
 3 files changed, 38 insertions(+), 9 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 1a1978c0c..eee80449d 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
@@ -212,8 +212,7 @@ public class ProjectRxswinEOController extends JeroController<ProjectRxswinEO, I
 									@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 									@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 									HttpServletRequest req) {
-		 Page<ProjectRxswinEO> page = new Page<ProjectRxswinEO>(pageNo, pageSize);
-		 IPage<ProjectRxswinEO> pageList = projectRxswinEOService.getTwoPage(page,projectRxswinEO);
+		 IPage<ProjectRxswinEO> pageList = projectRxswinEOService.getTwoPage(pageNo,pageSize,projectRxswinEO);
 		 return Result.OK(pageList);
 	 }
 
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 f777c2dad..8eadcea48 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
@@ -75,11 +75,12 @@ public interface IProjectRxswinEOService extends IService<ProjectRxswinEO> {
 
 	/**
 	 * 调取--第二层
-	 * @param page
+	 * @param pageNo
+	 * @param pageSize
 	 * @param projectRxswinEO
 	 * @return
 	 */
-    Page<ProjectRxswinEO> getTwoPage(Page<ProjectRxswinEO> page,ProjectRxswinEO projectRxswinEO);
+    Page<ProjectRxswinEO> getTwoPage(Integer pageNo,Integer pageSize,ProjectRxswinEO projectRxswinEO);
 
 	/**
 	 * 提交
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 2b708c2ed..1b10e7f4e 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
@@ -190,17 +190,46 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl<ProjectRxswinEOMappe
 
 	/**
 	 * 调取--第二层
-	 * @param page
+	 * @param pageNo
+	 * @param pageSize
 	 * @param projectRxswinEO
 	 * @return
 	 */
 	@Override
-	public Page<ProjectRxswinEO> getTwoPage(Page<ProjectRxswinEO> page,ProjectRxswinEO projectRxswinEO) {
-		LambdaQueryWrapper<ProjectRxswinEO> wrapper = new LambdaQueryWrapper<>();
+	public Page<ProjectRxswinEO> getTwoPage(Integer pageNo,Integer pageSize,ProjectRxswinEO projectRxswinEO) {
+
+		LambdaQueryWrapper<ProjectRxswinEO> wrapper  =new LambdaQueryWrapper<>();
 		wrapper.eq(ProjectRxswinEO::getProjectId,projectRxswinEO.getProjectId());
 		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);
 	}
 
 	/**