|
@@ -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().list();
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- 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)) {
|