查项目下的交付物 分页

common/src/main/java/com/ccsens/common/bean/dto/CDeliverDto.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
@@ -67,5 +69,12 @@ public class CDeliverDto {
         @NotNull(message = "请选择项目信息")
         @ApiModelProperty("项目id")
         private Long projectId;
+        @ApiModelProperty("第几页")
+        @Min(value = 1)
+        private int pageNum = 1;
+        @ApiModelProperty("每页多少条")
+        @Min(value = 1)
+        @Max(value=100)
+        private int pageSize = 10;
     }
 }

common/src/main/java/com/ccsens/common/service/DeliverService.java

@@ -6,14 +6,14 @@ import cn.hutool.core.util.ObjectUtil;
 import com.ccsens.common.bean.dto.CDeliverDto;
 import com.ccsens.common.bean.po.ProDeliver;
 import com.ccsens.common.bean.po.ProDeliverChecker;
-import com.ccsens.common.bean.po.ProRoleTask;
 import com.ccsens.common.bean.po.ProTaskSub;
 import com.ccsens.common.bean.vo.CDeliverVo;
 import com.ccsens.common.bean.vo.CProjectVo;
 import com.ccsens.common.persist.dao.*;
 import com.ccsens.common.util.CommonCodeError;
-import com.ccsens.util.CodeError;
 import com.ccsens.util.exception.BaseException;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -144,16 +144,14 @@ public class DeliverService implements IDeliverService{
 
 
     @Override
-    public CDeliverVo.DeliverOfProject queryDeliverOfProject(CDeliverDto.QueryDeliverOfProject params, Long userId) {
+    public PageInfo<CDeliverVo.DeliverOfTask> queryDeliverOfProject(CDeliverDto.QueryDeliverOfProject params, Long userId) {
         CProjectVo.ProjectInfo projectById = projectDao.findProjectById(params.getProjectId());
         if (ObjectUtil.isNull(projectById)) {
             throw new BaseException(CommonCodeError.PROJECT_NOT_FOUND);
         }
+        PageHelper.startPage(params.getPageNum(),params.getPageSize());
         List<CDeliverVo.DeliverOfTask> deliverOfTask = deliverDao.queryDeliverOfProject(params);
-        CDeliverVo.DeliverOfProject deliverOfProject = new CDeliverVo.DeliverOfProject();
-        deliverOfProject.setProjectName(projectById.getName());
-        deliverOfProject.setDeliverOfTaskList(deliverOfTask);
-        return deliverOfProject;
+        return new PageInfo<>(deliverOfTask);
     }
 
 }

common/src/main/java/com/ccsens/common/service/IDeliverService.java

@@ -2,6 +2,7 @@ package com.ccsens.common.service;
 
 import com.ccsens.common.bean.dto.CDeliverDto;
 import com.ccsens.common.bean.vo.CDeliverVo;
+import com.github.pagehelper.PageInfo;
 
 import java.util.List;
 
@@ -46,5 +47,5 @@ public interface IDeliverService {
      * @param userId 用户id
      * @return 检查人列表
      */
-    CDeliverVo.DeliverOfProject queryDeliverOfProject(CDeliverDto.QueryDeliverOfProject params, Long userId);
+    PageInfo<CDeliverVo.DeliverOfTask> queryDeliverOfProject(CDeliverDto.QueryDeliverOfProject params, Long userId);
 }