Commit 5c55dde4 authored by 赵啸非's avatar 赵啸非

修改部分pom

parent 49088a1f
...@@ -436,6 +436,13 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT ...@@ -436,6 +436,13 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT
if (StringUtils.isNotBlank(histIns.getAssignee())) { if (StringUtils.isNotBlank(histIns.getAssignee())) {
flowTask.setAssigneeId(histIns.getAssignee()); flowTask.setAssigneeId(histIns.getAssignee());
} }
Task task = taskService.createTaskQuery().taskId(histIns.getTaskId()).singleResult();
if (!ObjectUtils.isEmpty(task)) {
flowTask.setTaskName(task.getName());
flowTask.setTaskId(task.getId());
}
//获取任务action 通过commentInfo获取 //获取任务action 通过commentInfo获取
CommentInfoQuery commentInfoQuery = new CommentInfoQuery(); CommentInfoQuery commentInfoQuery = new CommentInfoQuery();
commentInfoQuery.setTaskId(histIns.getTaskId()); commentInfoQuery.setTaskId(histIns.getTaskId());
...@@ -451,11 +458,14 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT ...@@ -451,11 +458,14 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT
flowTask.setDuration(histIns.getDurationInMillis() == null || histIns.getDurationInMillis() == 0 ? null : getDate(histIns.getDurationInMillis())); flowTask.setDuration(histIns.getDurationInMillis() == null || histIns.getDurationInMillis() == 0 ? null : getDate(histIns.getDurationInMillis()));
// 获取意见评论内容 // 获取意见评论内容
// flowTask.setTaskName(histIns.getn);
List<Comment> commentList = taskService.getProcessInstanceComments(histIns.getProcessInstanceId()); List<Comment> commentList = taskService.getProcessInstanceComments(histIns.getProcessInstanceId());
Boolean bool1 = false; Boolean bool1 = false;
for (Comment comment : commentList) { for (Comment comment : commentList) {
if (!"event".equalsIgnoreCase(comment.getType())&&histIns.getTaskId().equals(comment.getTaskId())) { if (!"event".equalsIgnoreCase(comment.getType()) && histIns.getTaskId().equals(comment.getTaskId())) {
flowTask.setComment(FlowCommentPdu.builder().type(comment.getType()).comment(comment.getFullMessage()).build()); flowTask.setComment(FlowCommentPdu.builder().type(comment.getType()).comment(comment.getFullMessage()).build());
bool1 = true; bool1 = true;
break; break;
...@@ -469,7 +479,6 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT ...@@ -469,7 +479,6 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT
} }
//查询当前任务是否存在子任务 //查询当前任务是否存在子任务
List<HistoricTaskInstance> subList = historyService.createHistoricTaskInstanceQuery() List<HistoricTaskInstance> subList = historyService.createHistoricTaskInstanceQuery()
.taskParentTaskId(histIns.getTaskId()) .taskParentTaskId(histIns.getTaskId())
...@@ -609,6 +618,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT ...@@ -609,6 +618,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT
//todo 完成加签流程 完成任务 携带附件信息 //todo 完成加签流程 完成任务 携带附件信息
ApiRespPdu<String> rsp = new ApiRespPdu<>(YesNoEnum.YES.getValue(), "审批成功"); ApiRespPdu<String> rsp = new ApiRespPdu<>(YesNoEnum.YES.getValue(), "审批成功");
try { try {
if (StringUtils.isNotBlank(completeTaskReq.getProcessInstanceId()) if (StringUtils.isNotBlank(completeTaskReq.getProcessInstanceId())
&& StringUtils.isNotBlank(completeTaskReq.getTaskId())) { && StringUtils.isNotBlank(completeTaskReq.getTaskId())) {
//1.查看当前任务是存在 //1.查看当前任务是存在
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment