修改部分pom

common-lib/src/main/java/com/mortals/xhx/common/pdu/flow/FlowTaskPdu.java

@@ -110,6 +110,9 @@ public class FlowTaskPdu implements Serializable {
     @ApiModelProperty("附件信息")
     private List<AttachmentEntity> attachmentList;
 
+
+    private String action;
+
     /**
      * 用户名称
      */

common-lib/src/main/java/com/mortals/xhx/flowable/BaseTaskReq.java

@@ -70,6 +70,6 @@ public abstract class BaseTaskReq implements Serializable {
      */
     private List<String> candidateGroups;
 
-
+    private String action;
 
 }

common-lib/src/main/java/com/mortals/xhx/flowable/task/CompleteTaskReq.java

@@ -8,7 +8,6 @@ import com.mortals.xhx.flowable.BaseTaskReq;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -39,9 +38,9 @@ public class CompleteTaskReq extends BaseTaskReq implements Serializable {
     private Map<String, Object> variables;
 
     /**
-     * 附件列表 附件 选填
+     * 任务参数 附件 选填
      */
-    @ApiModelProperty(value = "附件列表")
+    @ApiModelProperty(value = "任务参数")
     private List<AttachmentEntity> attachments;
 
 

workflow-engine/src/main/java/com/mortals/flowable/service/FlowTaskServiceImpl.java

@@ -21,11 +21,11 @@ import com.mortals.xhx.flowable.AttachmentEntity;
 import com.mortals.xhx.flowable.BaseTaskReq;
 import com.mortals.xhx.flowable.task.*;
 import com.mortals.xhx.module.comment.model.CommentInfoEntity;
+import com.mortals.xhx.module.comment.model.CommentInfoQuery;
 import com.mortals.xhx.module.comment.service.CommentInfoService;
 import com.mortals.xhx.module.extend.model.ExtendHisprocinstEntity;
 import com.mortals.xhx.module.extend.service.ExtendHisprocinstService;
 import lombok.extern.apachecommons.CommonsLog;
-import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -65,7 +65,7 @@ import java.util.stream.Collectors;
  * @description:
  **/
 @RestController
-@Slf4j
+@CommonsLog
 public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowTaskFeign {
 
     @Autowired
@@ -330,7 +330,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT
     @Override
     public ApiRespPdu<Result<FlowTaskPdu>> todoList(CommonTaskReq req) {
         PageInfo pageInfo = req.getPageInfo();
-        log.info("查询我的代办列表！query userCode:{},tenantId:{},req:{}", req.getUserCode(), req.getPlatformSn(), JSON.toJSONString(req));
+        log.info(String.format("查询我的代办列表！query userCode:%s,tenantId:%s,PageInfo:%s", req.getUserCode(), req.getPlatformSn(), JSON.toJSONString(pageInfo)));
         ApiRespPdu<Result<FlowTaskPdu>> rsp = new ApiRespPdu<>();
         Result<FlowTaskPdu> result = new Result<>();
         rsp.setCode(YesNoEnum.YES.getValue());
@@ -364,7 +364,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT
             result.setList(applyedTasks);
             result.setPageInfo(pageInfo);
             rsp.setData(result);
-            log.info("查询我的代办列表！resp:{}", JSON.toJSONString(rsp));
+            log.info(String.format("查询我的代办列表！resp:%s", JSON.toJSONString(rsp)));
             return rsp;
         } catch (Exception e) {
             log.error("异常：", e);
@@ -435,6 +435,14 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT
                         if (StringUtils.isNotBlank(histIns.getAssignee())) {
                             flowTask.setAssigneeId(histIns.getAssignee());
                         }
+                        //获取任务action 通过commentInfo获取
+                        CommentInfoQuery commentInfoQuery = new CommentInfoQuery();
+                        commentInfoQuery.setTaskId(histIns.getTaskId());
+
+                        CommentInfoEntity commentInfoEntity = commentInfoService.selectOne(commentInfoQuery);
+                        if(!ObjectUtils.isEmpty(commentInfoEntity)){
+                            flowTask.setAction(commentInfoEntity.getAction());//flowTask.setAction();
+                        }
 
                         buildPerson(histIns.getTaskId(), flowTask);
 
@@ -551,7 +559,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT
 
     @Override
     public ApiRespPdu<Map<String, Object>> processVariables(CommonTaskReq req) {
-        log.info("获取流程变量！taskId:{}", req.getTaskId());
+        log.info(String.format("获取流程变量！taskId:%s", req.getTaskId()));
         ApiRespPdu<Map<String, Object>> rsp = new ApiRespPdu<>();
         rsp.setCode(YesNoEnum.YES.getValue());
         try {
@@ -577,7 +585,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT
 
     @Override
     public ApiRespPdu<String> setProcessVariables(CommonTaskReq req) {
-        log.info("设置流程变量！taskId:{}", req.getTaskId());
+        log.info(String.format("设置流程变量！taskId:%s", req.getTaskId()));
         ApiRespPdu<String> rsp = new ApiRespPdu<>();
         rsp.setCode(YesNoEnum.YES.getValue());
         try {
@@ -593,7 +601,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT
 
     @Override
     public ApiRespPdu<String> complete(CompleteTaskReq completeTaskReq) {
-        log.info("完成任务！completeTaskReq:{}", JSON.toJSONString(completeTaskReq));
+        log.info(String.format("完成任务！completeTaskReq:%s", JSON.toJSONString(completeTaskReq)));
         //todo 完成加签流程  完成任务 携带附件信息
         ApiRespPdu<String> rsp = new ApiRespPdu<>(YesNoEnum.YES.getValue(), "审批成功");
         try {
@@ -602,14 +610,12 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT
                 //1.查看当前任务是存在
                 TaskEntity taskEntity = (TaskEntity) taskService.createTaskQuery().taskId(completeTaskReq.getTaskId()).singleResult();
                 if (taskEntity != null) {
-
                     String taskId = completeTaskReq.getTaskId();
                     //2.委派处理
                     if (DelegationState.PENDING.equals(taskEntity.getDelegationState())) {
                         //2.1生成历史记录
                         TaskEntity subTask = this.createSubTask(taskEntity, taskEntity.getParentTaskId(), completeTaskReq.getUserCode());
                         taskService.addComment(completeTaskReq.getTaskId(), completeTaskReq.getProcessInstanceId(), FlowComment.DELEGATE.getType(), completeTaskReq.getMessage());
-
                         //添加附件
                         if (!ObjectUtils.isEmpty(completeTaskReq.getAttachments())) {
                             completeTaskReq.getAttachments().stream().peek(item -> {
@@ -621,15 +627,15 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT
                         //2.2执行委派
                         taskService.resolveTask(completeTaskReq.getTaskId(), completeTaskReq.getVariables());
                     } else {
-
                         //如果是拒绝，则是拒绝意见
                         Map<String, Object> map = completeTaskReq.getVariables();
-
                         String bool = (String) map.getOrDefault("approve", "true");
                         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());
                         }
 
                         if (!ObjectUtils.isEmpty(completeTaskReq.getAttachments())) {
@@ -1333,6 +1339,9 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT
         commentInfo.setMessage(baseTaskReq.getMessage());
 
         commentInfo.setTaskId(baseTaskReq.getTaskId());
+
+        commentInfo.setAction(baseTaskReq.getAction());
+
         // commentInfo.setActivityId(baseTaskReq.getActivityId());
         // commentInfo.setActivityName(baseTaskReq.getActivityName());