分页

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java

@@ -63,8 +63,7 @@ public class ProjectRxswinEOController extends JeroController<ProjectRxswinEO, I
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
 		QueryWrapper<ProjectRxswinEO> queryWrapper = QueryGenerator.initQueryWrapper(projectRxswinEO, req.getParameterMap());
-		Page<ProjectRxswinEO> page = new Page<ProjectRxswinEO>(pageNo, pageSize);
+		IPage<ProjectRxswinEO> pageList = projectRxswinEOService.getPageInfo(pageNo,pageSize, projectRxswinEO);
-		IPage<ProjectRxswinEO> pageList = projectRxswinEOService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
 

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;
+
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java

@@ -62,6 +62,8 @@ public interface IProjectRxswinEOService extends IService<ProjectRxswinEO> {
 	 */
     List<ProjectRxswinEO> queryList();
 
+	Page<ProjectRxswinEO> getPageInfo(Integer pageNo,Integer pageSize,ProjectRxswinEO projectRxswinEO);
+
 	/**
 	 * 调取--第一层
 	 * @param pageNo

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<ProjectRxswinEOMappe
 
 	@Autowired
 	private ProjectRxswinEOMapper projectRxswinEOMapper;
+	@Autowired
+	private BussDocumentLibraryEOServiceImpl bussDocumentLibraryEOService;
 	/**
 	 * 保存
 	 *
@@ -123,6 +128,40 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl<ProjectRxswinEOMappe
         return list();
     }
 
+	@Override
+	public Page<ProjectRxswinEO> getPageInfo(Integer pageNo,Integer pageSize, ProjectRxswinEO projectRxswinEO) {
+		LambdaQueryWrapper<ProjectRxswinEO> 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<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);
+	}
+
 	/**
 	 * 调取--第一层
 	 * @param pageNo
@@ -278,4 +317,11 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl<ProjectRxswinEOMappe
 			saveBatchInfo(projectId, user, noList);
 		}
 	}
+
+
+	public List<BussDocumentLibraryEO> getBussDocumentLibraryEOList(List<String> documentIdList){
+		LambdaQueryWrapper<BussDocumentLibraryEO> wrapper = new LambdaQueryWrapper<>();
+		wrapper.in(BussDocumentLibraryEO::getId,documentIdList);
+		return bussDocumentLibraryEOService.list(wrapper);
+	}
 }