|
@@ -146,16 +146,15 @@ public class FlowTask extends FlowableConfig {
|
|
|
* @param attachmentDescription 附件描述
|
|
|
*/
|
|
|
public BaseResult completeTask(String taskId, String type, String message, MultipartFile[] files, String attachmentDescription, String userId) {
|
|
|
+ System.out.println("===========other===========start");
|
|
|
// 任务处理人与当前人员是否匹配
|
|
|
Page<Map<String, Object>> taskList = getMyTask(userId, taskId, null, 1, 1);
|
|
|
if (taskList.getTotal() == 0) {
|
|
|
return new BaseResult("500", "任务与当前人员不匹配或任务已完成!", null);
|
|
|
}
|
|
|
Task task;
|
|
|
- ProcessInstance instance;
|
|
|
try {
|
|
|
task = taskService.createTaskQuery().taskId(taskId).singleResult();
|
|
|
- instance = runtimeService.createProcessInstanceQuery().processInstanceId(task.getProcessInstanceId()).singleResult();
|
|
|
// 添加意见
|
|
|
if (!StringUtils.isEmpty(message)) {
|
|
|
taskService.addComment(taskId, task.getProcessInstanceId(), type, message);
|
|
@@ -167,20 +166,27 @@ public class FlowTask extends FlowableConfig {
|
|
|
if (task.getAssignee() == null) {
|
|
|
taskService.claim(taskId, userId);
|
|
|
}
|
|
|
+ System.out.println("===========other===========end");
|
|
|
+ System.out.println("===========messageService.completeMessage===========start");
|
|
|
+ try {
|
|
|
+ // 消息通知
|
|
|
+ // 消息通知完成状态修改
|
|
|
+ messageService.completeMessage(task.getProcessInstanceId());
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ System.out.println("===========messageService.completeMessage===========end");
|
|
|
+
|
|
|
// 完成任务
|
|
|
+ System.out.println("===========taskService.complete(taskId)===========start");
|
|
|
taskService.complete(taskId);
|
|
|
- } catch (Exception e) {
|
|
|
- e.printStackTrace();
|
|
|
- return new BaseResult("500", "任务处理失败!", null);
|
|
|
- }
|
|
|
- try {
|
|
|
- // 消息通知
|
|
|
- // 消息通知完成状态修改
|
|
|
- messageService.completeMessage(task.getProcessInstanceId());
|
|
|
+ System.out.println("===========taskService.complete(taskId)===========end");
|
|
|
+
|
|
|
// 新增消息通知
|
|
|
messageService.addStartFlowMessage(task.getProcessInstanceId());
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
+ return new BaseResult("500", "任务处理失败!", null);
|
|
|
}
|
|
|
|
|
|
return new BaseResult();
|