Browse Source

流程数据修改

wangliang 3 years ago
parent
commit
c73dcea244

+ 1 - 13
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/ActivitiService.java

@@ -40,18 +40,6 @@ public interface ActivitiService {
      */
     public ProcessInstance startActivity(String processKey, Map<String, Object> map);
 
-    /**
-     * 获取任务列表
-     */
-    void getTaskList();
-
-    /**
-     * 完成流程
-     *
-     * @param taskId
-     */
-    void complete(String taskId);
-
     /**
      * 流程终止
      *
@@ -60,7 +48,7 @@ public interface ActivitiService {
     public void flowEnd(String flowId);
 
     /**
-     * 流程启动
+     * 流程审批启动
      *
      * @param map
      */

+ 2 - 52
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ActivitiServiceImpl.java

@@ -90,12 +90,6 @@ public class ActivitiServiceImpl implements ActivitiService {
     @Resource
     SysUserService sysUserService;
 
-    @Resource
-    BasicCourseService basicCourseService;
-
-    @Resource
-    SysOrgService sysOrgService;
-
     /**
      * 注册流程
      *
@@ -120,37 +114,6 @@ public class ActivitiServiceImpl implements ActivitiService {
         builder.deploy();
     }
 
-    /**
-     * 查询待办
-     */
-    @Override
-    public void getTaskList() {
-        //获取待办的一些信息,这里可以传入需要查询的用户,
-        //我这里查询的所有待办
-//        List<Task> tasks = taskService.createTaskQuery().taskAssignee("test123").orderByTaskCreateTime().desc().list();
-        List<Task> tasks = taskService.createTaskQuery().list();
-//        Task task1 = taskService.createTaskQuery().processInstanceId("22531").singleResult();
-//        Task task1 = taskService.createTaskQuery()
-//                .processDefinitionKey("myProcess3")
-//                .taskCandidateUser("赵总")//设置候选用户
-//                .singleResult();
-//        Task task2 = taskService.createTaskQuery()
-//                .processDefinitionKey("myProcess3")
-//                .taskCandidateUser("王总")//设置候选用户
-//                .singleResult();
-//        Task task3 = taskService.createTaskQuery()
-//                .processDefinitionKey("myProcess3")
-//                .taskCandidateUser("王总1")//设置候选用户
-//                .singleResult();
-//        Task task4 = taskService.createTaskQuery()
-//                .processDefinitionKey("myProcess3")
-//                .taskCandidateUser("赵总1")//设置候选用户
-//                .singleResult();
-        for (Task t : tasks) {
-            log.info("assignee:{},createTime:{},id:{},getProcessDefinitionId:{},name:{},processInstanceId:{},taskDefinitionKey:{},parentTaskId:{}", t.getAssignee(), t.getCreateTime(), t.getId(), t.getProcessDefinitionId(), t.getName(), t.getProcessInstanceId(), t.getTaskDefinitionKey(), t.getParentTaskId());
-        }
-    }
-
     /**
      * 根据流程key开启一个流程
      *
@@ -174,20 +137,6 @@ public class ActivitiServiceImpl implements ActivitiService {
         return processInstance;
     }
 
-    /**
-     * 根据任务id提交任务
-     *
-     * @param taskId
-     */
-    @Override
-    public void complete(String taskId) {
-        Map<String, Object> map = new HashMap<>();
-        map.put("user", 1);
-        map.put("approve", 1);
-        map.put("assignee", 0);
-        taskService.complete(taskId, map);
-    }
-
     /**
      * 根据流程id直接结束流程
      *
@@ -283,7 +232,7 @@ public class ActivitiServiceImpl implements ActivitiService {
     }
 
     /**
-     * 流程启动
+     * 流程审批启动
      *
      * @param map
      */
@@ -601,6 +550,7 @@ public class ActivitiServiceImpl implements ActivitiService {
      * @return
      */
     @Override
+    @Transactional
     public boolean taskApproverExchange(String userId, String taskId) {
         Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
         if (Objects.isNull(task)) {