Commit 2f1cf898 authored by 赵啸非's avatar 赵啸非

修改部分pom

parent 4a75aa95
...@@ -413,7 +413,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT ...@@ -413,7 +413,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT
@Override @Override
public ApiRespPdu<List<FlowTaskPdu>> flowRecord(CommonTaskReq req) { public ApiRespPdu<List<FlowTaskPdu>> flowRecord(CommonTaskReq req) {
log.info(String.format("流程记录!procInsId:%s", req.getProcessInstanceId())); log.info("流程记录!procInsId:{}", req.getProcessInstanceId());
ApiRespPdu<List<FlowTaskPdu>> rsp = new ApiRespPdu<>(); ApiRespPdu<List<FlowTaskPdu>> rsp = new ApiRespPdu<>();
rsp.setCode(YesNoEnum.YES.getValue()); rsp.setCode(YesNoEnum.YES.getValue());
try { try {
...@@ -441,7 +441,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT ...@@ -441,7 +441,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT
commentInfoQuery.setTaskId(histIns.getTaskId()); commentInfoQuery.setTaskId(histIns.getTaskId());
CommentInfoEntity commentInfoEntity = commentInfoService.selectOne(commentInfoQuery); CommentInfoEntity commentInfoEntity = commentInfoService.selectOne(commentInfoQuery);
if(!ObjectUtils.isEmpty(commentInfoEntity)){ if (!ObjectUtils.isEmpty(commentInfoEntity)) {
flowTask.setAction(commentInfoEntity.getAction());//flowTask.setAction(); flowTask.setAction(commentInfoEntity.getAction());//flowTask.setAction();
} }
...@@ -473,7 +473,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT ...@@ -473,7 +473,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT
.orderByHistoricTaskInstanceStartTime() .orderByHistoricTaskInstanceStartTime()
.asc().list(); .asc().list();
for (HistoricTaskInstance item : subList) { for (HistoricTaskInstance item : subList) {
log.info(String.format("sub,id%s,type%s", item.getId(), item.getScopeType())); log.info("subid :{},type :{}", item.getId(), item.getScopeType());
FlowTaskPdu flowTaskPdu = new FlowTaskPdu(); FlowTaskPdu flowTaskPdu = new FlowTaskPdu();
flowTaskPdu.setTaskId(item.getId()); flowTaskPdu.setTaskId(item.getId());
flowTaskPdu.setTaskName(item.getName()); flowTaskPdu.setTaskName(item.getName());
...@@ -1334,17 +1334,14 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT ...@@ -1334,17 +1334,14 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT
protected void addFlowCommentInfoAndProcessStatus(BaseTaskReq baseTaskReq) { protected void addFlowCommentInfoAndProcessStatus(BaseTaskReq baseTaskReq) {
//添加自定义评论 //添加自定义评论
CommentInfoEntity commentInfo = new CommentInfoEntity(); CommentInfoEntity commentInfo = new CommentInfoEntity();
//commentInfo.setType(baseTaskReq.getCommentTypeEnum().name()); commentInfo.setType(baseTaskReq.getCommentTypeEnum().name());
commentInfo.setPersonalCode(baseTaskReq.getUserCode()); commentInfo.setPersonalCode(baseTaskReq.getUserCode());
commentInfo.setProcessInstanceId(baseTaskReq.getProcessInstanceId()); commentInfo.setProcessInstanceId(baseTaskReq.getProcessInstanceId());
commentInfo.setMessage(baseTaskReq.getMessage()); commentInfo.setMessage(baseTaskReq.getMessage());
commentInfo.setTaskId(baseTaskReq.getTaskId()); commentInfo.setTaskId(baseTaskReq.getTaskId());
commentInfo.setAction(baseTaskReq.getAction()); commentInfo.setAction(baseTaskReq.getAction());
commentInfo.setActivityId(baseTaskReq.getActivityId());
// commentInfo.setActivityId(baseTaskReq.getActivityId()); commentInfo.setActivityName(baseTaskReq.getActivityName());
// commentInfo.setActivityName(baseTaskReq.getActivityName());
commentInfoService.save(commentInfo); commentInfoService.save(commentInfo);
//2.修改流程实例的状态, //2.修改流程实例的状态,
......
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