Commit 49088a1f authored by 赵啸非's avatar 赵啸非

修改部分pom

parent a5c60fbb
......@@ -110,6 +110,10 @@ public class FlowTaskPdu implements Serializable {
@ApiModelProperty("附件信息")
private List<AttachmentEntity> attachmentList;
/**
* 任务类型
*/
private String type;
private String action;
......
......@@ -443,6 +443,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT
CommentInfoEntity commentInfoEntity = commentInfoService.selectOne(commentInfoQuery);
if (!ObjectUtils.isEmpty(commentInfoEntity)) {
flowTask.setAction(commentInfoEntity.getAction());//flowTask.setAction();
flowTask.setType(commentInfoEntity.getType());
}
buildPerson(histIns.getTaskId(), flowTask);
......@@ -467,6 +468,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT
hisFlowList.add(flowTask);
}
//查询当前任务是否存在子任务
List<HistoricTaskInstance> subList = historyService.createHistoricTaskInstanceQuery()
.taskParentTaskId(histIns.getTaskId())
......@@ -635,8 +638,6 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT
if ("true".equals(bool)) {
taskService.addComment(completeTaskReq.getTaskId(), taskEntity.getProcessInstanceId(), FlowComment.NORMAL.getType(), completeTaskReq.getMessage());
completeTaskReq.setAction(FlowComment.NORMAL.getType());
} else {
taskService.addComment(completeTaskReq.getTaskId(), taskEntity.getProcessInstanceId(), FlowComment.REJECT.getType(), completeTaskReq.getMessage());
completeTaskReq.setAction(FlowComment.REJECT.getType());
......
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