variables = new HashMap<>();
+ variables.put("assignee2", "zhao");
+ //完成任务,参数：任务id
+ taskService.complete(task.getId(), variables);
+ }
+
+ /**
+ * 查询当前个人待执行的任务
+ *
+ * 流程实例id：245a58e7-0923-11ee-8637-b60fbe4e0138
+ * 任务id：29c9f30a-0923-11ee-abdf-b60fbe4e0138
+ * 任务负责人：zhao
+ * 任务名称：Personnel approval
+ */
+ @Test
+ public void findPendingTaskList03() {
+ //任务负责人
+ String assignee = "zhao";
+ List list = taskService.createTaskQuery().taskAssignee(assignee)//只查询该任务负责人的任务
+ .list();
+ for (Task task : list) {
+ System.out.println("流程实例id：" + task.getProcessInstanceId());
+ System.out.println("任务id：" + task.getId());
+ System.out.println("任务负责人：" + task.getAssignee());
+ System.out.println("任务名称：" + task.getName());
+ }
+ }
+
+
+}
diff --git a/service-oa/src/test/java/com/atguigu/auth/activti/ProcessTestDome3.java b/service-oa/src/test/java/com/atguigu/auth/activti/ProcessTestDome3.java
new file mode 100644
index 0000000..069a069
--- /dev/null
+++ b/service-oa/src/test/java/com/atguigu/auth/activti/ProcessTestDome3.java
@@ -0,0 +1,138 @@
+package com.atguigu.auth.activti;
+
+import org.activiti.engine.HistoryService;
+import org.activiti.engine.RepositoryService;
+import org.activiti.engine.RuntimeService;
+import org.activiti.engine.TaskService;
+import org.activiti.engine.repository.Deployment;
+import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.task.Task;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * ClassName: ProcessTestDome3
+ * Package: com.atguigu.auth.activti
+ *
+ * @author yovinchen
+ * @Create 2023/6/12 20:38
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class ProcessTestDome3 {
+
+
+ /**
+ * 流程定义
+ */
+ @Autowired
+ private RepositoryService repositoryService;
+
+ /**
+ * 流程实例
+ */
+ @Autowired
+ private RuntimeService runtimeService;
+
+ /**
+ * 流程任务
+ */
+ @Autowired
+ private TaskService taskService;
+
+ /**
+ * 相关操作历史
+ */
+ @Autowired
+ private HistoryService historyService;
+
+ /**
+ * 1.部署流程定义和启动流程实例
+ */
+ @Test
+ public void deployProcess03() {
+ // 流程部署
+ Deployment deploy = repositoryService.createDeployment().addClasspathResource("process/overtime04.bpmn20.xml").name("加班申请流程04").deploy();
+ System.out.println(deploy.getId());
+ System.out.println(deploy.getName());
+
+ Map map = new HashMap<>();
+// map.put("assignee1", "Lucy03");
+// map.put("assignee2", "Mack01");
+ //创建流程实例,我们需要知道流程定义的key
+ ProcessInstance processInstance = runtimeService.startProcessInstanceByKey("overtime04", map);
+ //输出实例的相关信息
+ System.out.println("流程定义id：" + processInstance.getProcessDefinitionId());
+ System.out.println("流程实例id：" + processInstance.getId());
+ }
+
+ /**
+ * 2.查询组任务
+ */
+ @Test
+ public void findGroupTaskList() {
+ List list = taskService.createTaskQuery()
+ .taskCandidateUser("tom01")
+ .list();
+ for (Task task : list) {
+ System.out.println("----------------------------");
+ System.out.println("流程实例id：" + task.getProcessInstanceId());
+ System.out.println("任务id：" + task.getId());
+ System.out.println("任务负责人：" + task.getAssignee());
+ System.out.println("任务名称：" + task.getName());
+ }
+ }
+
+ /**
+ * 3.拾取组任务
+ */
+ @Test
+ public void claimTask() {
+ //拾取任务,即使该用户不是候选人也能拾取(建议拾取时校验是否有资格)
+ //校验该用户有没有拾取任务的资格
+ Task task = taskService.createTaskQuery()
+ .taskCandidateUser("tom01")//根据候选人查询
+ .singleResult();
+ if (task != null) {
+ //拾取任务
+ taskService.claim(task.getId(), "tom01");
+ System.out.println("任务拾取成功");
+ }
+ }
+
+ /**
+ * 4.查询个人代办任务
+ */
+ @Test
+ public void findGroupPendingTaskList() {
+ //任务负责人
+ String assignee = "tom01";
+ List list = taskService.createTaskQuery()
+ .taskAssignee(assignee)//只查询该任务负责人的任务
+ .list();
+ for (Task task : list) {
+ System.out.println("流程实例id：" + task.getProcessInstanceId());
+ System.out.println("任务id：" + task.getId());
+ System.out.println("任务负责人：" + task.getAssignee());
+ System.out.println("任务名称：" + task.getName());
+ }
+ }
+
+ /**
+ * 5.办理个人任务
+ */
+ @Test
+ public void completGroupTask() {
+ Task task = taskService.createTaskQuery()
+ .taskAssignee("tom01") //要查询的负责人
+ .singleResult();//返回一条
+ taskService.complete(task.getId());
+ }
+}
diff --git a/service-oa/src/test/java/com/atguigu/auth/activti/UserBean.java b/service-oa/src/test/java/com/atguigu/auth/activti/UserBean.java
new file mode 100644
index 0000000..75c3643
--- /dev/null
+++ b/service-oa/src/test/java/com/atguigu/auth/activti/UserBean.java
@@ -0,0 +1,25 @@
+package com.atguigu.auth.activti;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * ClassName: UserBean
+ * Package: com.atguigu.auth.activti
+ *
+ * @author yovinchen
+ * @Create 2023/6/12 14:52
+ */
+
+@Component
+public class UserBean {
+
+ public String getUsername(int id) {
+ if (id == 1) {
+ return "Mac";
+ }
+ if (id == 2) {
+ return "Lila";
+ }
+ return "admin";
+ }
+}
diff --git a/service-oa/src/test/java/com/atguigu/code/CodeGet.java b/service-oa/src/test/java/com/atguigu/code/CodeGet.java
index a622a92..4be8cab 100644
--- a/service-oa/src/test/java/com/atguigu/code/CodeGet.java
+++ b/service-oa/src/test/java/com/atguigu/code/CodeGet.java
@@ -38,7 +38,7 @@ public class CodeGet {
// 4、包配置
PackageConfig pc = new PackageConfig();
pc.setParent("com.atguigu");
- pc.setModuleName("auth"); //模块名
+ pc.setModuleName("process"); //模块名
pc.setController("controller");
pc.setService("service");
pc.setMapper("mapper");
@@ -47,7 +47,7 @@ public class CodeGet {
// 5、策略配置
StrategyConfig strategy = new StrategyConfig();
- strategy.setInclude("sys_menu","sys_role_menu");
+ strategy.setInclude("oa_process_type","oa_process_template");
//数据库表映射到实体的命名策略
strategy.setNaming(NamingStrategy.underline_to_camel);
//数据库表字段映射到实体的命名策略
diff --git a/service-oa/src/test/java/com/atguigu/process/Test.java b/service-oa/src/test/java/com/atguigu/process/Test.java
new file mode 100644
index 0000000..4d40368
--- /dev/null
+++ b/service-oa/src/test/java/com/atguigu/process/Test.java
@@ -0,0 +1,37 @@
+package com.atguigu.process;
+
+import com.atguigu.common.result.Result;
+import com.atguigu.model.process.ProcessTemplate;
+import com.atguigu.model.system.SysRole;
+import com.atguigu.process.service.OaProcessTemplateService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+import java.util.List;
+
+/**
+ * ClassName: Test
+ * Package: com.atguigu.process
+ *
+ * @author yovinchen
+ * @Create 2023/6/15 18:32
+ */
+@SpringBootTest
+public class Test {
+
+ @Autowired
+ private OaProcessTemplateService processTemplateService;
+ @org.junit.jupiter.api.Test
+ public void getPage() {
+ Page pageInfo = new Page<>(1, 10);
+ //分页查询审批模板，把审批类型对应名称查询
+ IPage pageModel =
+ processTemplateService.selectPageProcessTemplate(pageInfo);
+
+ }
+}