新增分页

src/main/java/com/tykj/workflowcore/workflow_editer/controller/FlowsInfoController.java

@@ -53,6 +53,7 @@ public class FlowsInfoController {
     @ApiOperation(value = "查询流程信息")
     public ResponseEntity searchFlowInfo(SearchFlowInfoVo searchFlowInfoVo){
         Page<FlowsInfo> flowsInfoList = flowInfoService.searchFlowInfo(searchFlowInfoVo);
+
         return ResultUtil.success(flowsInfoList,"查询成功");
     }
 

src/main/java/com/tykj/workflowcore/workflow_editer/controller/FormPageController.java

@@ -9,9 +9,11 @@ import com.tykj.workflowcore.workflow_editer.service.FormPageService;
 //import com.tykj.workflowcore.workflow_editer.service.PageEntityService;
 import com.tykj.workflowcore.workflow_editer.vo.InFormPageVo;
 import com.tykj.workflowcore.workflow_editer.vo.OutFormPageVo;
+import com.tykj.workflowcore.workflow_editer.vo.PageFormPageVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
@@ -57,8 +59,9 @@ public class FormPageController {
 
     @ApiOperation("查看页面")
     @GetMapping("/findPages")
-    public List<OutFormPageVo> findPages(){
-        return  formPageService.getAllPages();
+    public ResponseEntity findPages(@RequestBody PageFormPageVo pageFormPageVo){
+
+        return  ResultUtil.success(formPageService.getAllPages(pageFormPageVo),"查询成功");
     }
 
     @ApiOperation("删除页面")

src/main/java/com/tykj/workflowcore/workflow_editer/controller/WorkFlowController.java

@@ -37,6 +37,7 @@ public class WorkFlowController {
 
     @Autowired
     private WorkFlowService workFlowService;
+
     @PostMapping("/deploy")
     @ApiOperation(value = "部署流程",notes = "0 部署成功")
     public Integer deploy(Long id) throws FileNotFoundException {
@@ -65,7 +66,7 @@ public class WorkFlowController {
     }
 
     @PostMapping("/findTaskDetail")
-    @ApiOperation("任务个人待办详情")
+    @ApiOperation("任务个人待办任务详情")
     public Map<String, Object> findTaskDetail(String taskId){
         return  workFlowService.findTaskDetail(taskId);
     }
@@ -74,7 +75,7 @@ public class WorkFlowController {
     @ApiOperation("完成任务")
     public ResponseEntity completeTask(@RequestBody TaskVo taskVo){
         workFlowService.completeTask(taskVo);
-        return ResultUtil.success("该任务已完成");
+        return ResultUtil.success("该任务已被完成");
     }
 
     @PostMapping("/isTransferTask")

src/main/java/com/tykj/workflowcore/workflow_editer/service/FlowInfoService.java

@@ -68,7 +68,7 @@ public interface FlowInfoService {
     FlowsInfo disableFlow(Long flowInfoId);
 
     /**
-     * 有条件的查询flowinfo
+     * 有条件的查询flowInfo
      * @param searchFlowInfoVo
      * @return
      */

src/main/java/com/tykj/workflowcore/workflow_editer/service/FormPageService.java

@@ -4,6 +4,8 @@ import com.tykj.workflowcore.model_layer.model.TableInfo;
 import com.tykj.workflowcore.workflow_editer.entity.FormPage;
 import com.tykj.workflowcore.workflow_editer.vo.InFormPageVo;
 import com.tykj.workflowcore.workflow_editer.vo.OutFormPageVo;
+import com.tykj.workflowcore.workflow_editer.vo.PageFormPageVo;
+import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -47,9 +49,10 @@ public interface FormPageService {
 
     /**
      * 查询全部页面
+     * @param pageFormPageVo 分页
      * @return 全部集合
      */
-    List<OutFormPageVo> getAllPages();
+    Page<FormPage> getAllPages(PageFormPageVo pageFormPageVo);
 
     /**
      * 根据页面id查询tableInfo

src/main/java/com/tykj/workflowcore/workflow_editer/service/impl/FormPageServiceImpl.java

@@ -5,12 +5,15 @@ import com.github.wenhao.jpa.PredicateBuilder;
 import com.github.wenhao.jpa.Specifications;
 import com.tykj.workflowcore.model_layer.dao.TableInfoDao;
 import com.tykj.workflowcore.model_layer.model.TableInfo;
+import com.tykj.workflowcore.workflow_editer.entity.FlowsInfo;
 import com.tykj.workflowcore.workflow_editer.entity.FormPage;
 import com.tykj.workflowcore.workflow_editer.mapper.FormPageMapper;
 import com.tykj.workflowcore.workflow_editer.service.FormPageService;
 import com.tykj.workflowcore.workflow_editer.vo.InFormPageVo;
 import com.tykj.workflowcore.workflow_editer.vo.OutFormPageVo;
+import com.tykj.workflowcore.workflow_editer.vo.PageFormPageVo;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -62,18 +65,17 @@ public class FormPageServiceImpl implements FormPageService {
     }
 
     @Override
-    public List<OutFormPageVo> getAllPages() {
+    public Page<FormPage> getAllPages(PageFormPageVo pageFormPageVo) {
 
         ArrayList<OutFormPageVo> formPageVos = new ArrayList<>();
-        List<FormPage> formPages = formPageMapper.findAll();
-        for (FormPage formPage : formPages) {
-//            FormPageVo formPageVo = new FormPageVo();
-//            BeanUtils.copyProperties(formPage,formPageVo);
-//            formPageVos.add(formPageVo);
-            OutFormPageVo outFormPageVo = formPage.toEntityVo();
-            formPageVos.add(outFormPageVo);
-        }
-        return formPageVos;
+        PredicateBuilder<FormPage> and = Specifications.and();
+        and.eq(pageFormPageVo.getPageName()!=null,"pageName",pageFormPageVo.getPageName());
+        and.eq(pageFormPageVo.getPageDesc()!=null,"pageDesc",pageFormPageVo.getPageDesc());
+        and.eq(pageFormPageVo.getCreateTime()!=null,"createTime",pageFormPageVo.getCreateTime());
+
+        Page<FormPage> formPagePage = formPageMapper.findAll(and.build(), pageFormPageVo.getPageable());
+
+        return formPagePage;
     }
 
         @Override

src/main/java/com/tykj/workflowcore/workflow_editer/service/impl/WorkFlowServiceImpl.java

@@ -244,12 +244,12 @@ public class WorkFlowServiceImpl implements WorkFlowService {
         List<Map<String, Object>> listMap = new ArrayList<Map<String, Object>>();
         TaskQuery taskQuery = taskService.createTaskQuery().or();
         if (nextTaskVo.getUserId()!=null){
-            taskQuery.taskCandidateUser(nextTaskVo.getUserId()).orderByTaskCreateTime().desc();
+                    taskQuery.taskCandidateUser(nextTaskVo.getUserId()).orderByTaskCreateTime().desc();
         }
         if (nextTaskVo.getRoleId()!=null&&nextTaskVo.getRoleId().size()>0){
             taskQuery.taskCandidateGroupIn(nextTaskVo.getRoleId()).orderByTaskCreateTime().desc();
         }
-        List<Task> listTask = taskQuery.endOr().list();
+        List<Task> listTask = taskQuery.endOr().listPage(1,5);
         for (Task task : listTask) {
             Map<String, Object> map = new HashMap<>();
             ProcessInstance processInstance =

src/main/java/com/tykj/workflowcore/workflow_editer/vo/NextTaskVo.java

 package com.tykj.workflowcore.workflow_editer.vo;
 
+import com.tykj.workflowcore.base.page.JpaCustomOrder;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -17,7 +18,7 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class NextTaskVo {
+public class NextTaskVo  {
 
     private String userId;
 

src/main/java/com/tykj/workflowcore/workflow_editer/vo/OutFormPageVo.java

 package com.tykj.workflowcore.workflow_editer.vo;
 
+import com.tykj.workflowcore.base.page.JpaCustomOrder;
+import com.tykj.workflowcore.base.page.JpaCustomPage;
 import com.tykj.workflowcore.workflow_editer.entity.FormPage;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

src/main/java/com/tykj/workflowcore/workflow_editer/vo/PageFormPageVo.java

+package com.tykj.workflowcore.workflow_editer.vo;
+
+import com.tykj.workflowcore.base.page.JpaCustomPage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * ClassName:    PageFormPageVo
+ * Package:    com.tykj.workflowcore.workflow_editer.vo
+ * Description:
+ * Datetime:    2021/3/11   15:33
+ *
+ * @Author: zsp
+ */
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Api(tags = "分页查询页面")
+public class PageFormPageVo extends JpaCustomPage {
+
+    @ApiModelProperty("页面名称")
+    private String pageName;
+
+    @ApiModelProperty("页面描述")
+    private String pageDesc;
+
+    @ApiModelProperty("页面创建时间")
+    private Date createTime;
+
+}