diff --git a/blade-service-api/blade-zhaocai-api/src/main/java/org/springblade/zhaocai/pojo/vo/ZcProcessTaskQueryVO.java b/blade-service-api/blade-zhaocai-api/src/main/java/org/springblade/zhaocai/pojo/vo/ZcProcessTaskQueryVO.java new file mode 100644 index 0000000..03e1a9d --- /dev/null +++ b/blade-service-api/blade-zhaocai-api/src/main/java/org/springblade/zhaocai/pojo/vo/ZcProcessTaskQueryVO.java @@ -0,0 +1,21 @@ +package org.springblade.zhaocai.pojo.vo; + +import lombok.Data; + +@Data +public class ZcProcessTaskQueryVO { + /** + * 关键字 + */ + private String keyWord; + /** + * 流程名称 + */ + private String processName; + /** + * 流程Key + */ + private String processId; + + private String userCode; +} diff --git a/blade-service-api/blade-zhaocai-api/src/main/java/org/springblade/zhaocai/pojo/vo/ZcProcessTaskVO.java b/blade-service-api/blade-zhaocai-api/src/main/java/org/springblade/zhaocai/pojo/vo/ZcProcessTaskVO.java new file mode 100644 index 0000000..112d582 --- /dev/null +++ b/blade-service-api/blade-zhaocai-api/src/main/java/org/springblade/zhaocai/pojo/vo/ZcProcessTaskVO.java @@ -0,0 +1,86 @@ +package org.springblade.zhaocai.pojo.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class ZcProcessTaskVO implements Serializable { + + private static final long serialVersionUID = -1L; + + /** + * ID + */ + private String id; + /** + * 实例code + */ + private String instanceCode; + + + /** + * 流程名称 + */ + private String processName; + + + + /** + * 创建人 + */ + private String tCreateUser; + /** + * 创建人编号 + */ + private String tCreateUserAccount; + + /** + * 到达时间 + */ + private Date tArrivalTime; + + + /** + * 提交时间 + */ + private Date tSubmitTime; + + /** + * 当前审批节点 + */ + private String currentApprovalNode; + + + + /** + * 审批表单地址 + */ + private String approvalFormUrl; + + + /** + * 任务id + */ + private String taskId; + + /** + * + */ + private String processKey = "assign_task"; + + /** + * 节点key + */ + private String stepKey; + + + /** + * 阅知状态(待阅、已阅) + */ + private String pendingSubStatus; + + + +} diff --git a/blade-service-api/blade-zhaocai-api/src/main/java/org/springblade/zhaocai/pojo/vo/zcInitiateProcessVO.java b/blade-service-api/blade-zhaocai-api/src/main/java/org/springblade/zhaocai/pojo/vo/zcInitiateProcessVO.java new file mode 100644 index 0000000..af65b81 --- /dev/null +++ b/blade-service-api/blade-zhaocai-api/src/main/java/org/springblade/zhaocai/pojo/vo/zcInitiateProcessVO.java @@ -0,0 +1,15 @@ +package org.springblade.zhaocai.pojo.vo; + +import lombok.Data; + +@Data +public class zcInitiateProcessVO { + /** + * 流程名 + */ + private String processName; + /** + * 流程id + */ + private String processId; +} diff --git a/blade-service/blade-zhaocai/src/main/java/org/springblade/zhaocai/controller/ZcProcessController.java b/blade-service/blade-zhaocai/src/main/java/org/springblade/zhaocai/controller/ZcProcessController.java new file mode 100644 index 0000000..a7878ad --- /dev/null +++ b/blade-service/blade-zhaocai/src/main/java/org/springblade/zhaocai/controller/ZcProcessController.java @@ -0,0 +1,88 @@ +package org.springblade.zhaocai.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.springblade.core.tool.api.R; +import org.springblade.zhaocai.pojo.vo.*; +import org.springblade.zhaocai.service.IZcProcessService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/zcProcess") +public class ZcProcessController { + @Autowired + private IZcProcessService zcProcessService; + + /** + * 发起模块 + * @return + */ + @GetMapping("/initiateProcess") + public R initiateProcess() + { + List list=zcProcessService.initiateProcess(); + return R.data(list); + + } + + + + /** + * 获取待办列表 + * + * @param ZcProcessTaskQueryVO + * @param pageNo + * @param pageSize + * @return + */ + @GetMapping("/getPageList") + public R getTodoPageList(ZcProcessTaskQueryVO ZcProcessTaskQueryVO, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { + Page page = new Page(pageNo, pageSize); + page = zcProcessService.selectPageList(ZcProcessTaskQueryVO, page); + return R.data(page); + } + + + + + /** + * 获取已办列表 + * + * @param ZcProcessTaskQueryVO + * @param pageNo + * @param pageSize + * @return + */ + @GetMapping("/getDonePageList") + public R getDonePageList(ZcProcessTaskQueryVO ZcProcessTaskQueryVO, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { + Page page = new Page(pageNo, pageSize); + page = zcProcessService.selectDonePageList(ZcProcessTaskQueryVO, page); + return R.data(page); + } + + /** + * 获取已申请列表 + * + * @param ZcProcessTaskQueryVO + * @param pageNo + * @param pageSize + * @return + */ + @GetMapping("/getAppliedPageList") + public R getAppliedPageList(ZcProcessTaskQueryVO ZcProcessTaskQueryVO, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { + Page page = new Page(pageNo, pageSize); + page = zcProcessService.selectAppliedPageList(ZcProcessTaskQueryVO, page); + return R.data(page); + } +}