流程待办加入流程状态

sop-business/src/main/java/com/qmth/sop/business/activiti/service/impl/ActivitiServiceImpl.java

@@ -380,7 +380,10 @@ public class ActivitiServiceImpl implements ActivitiService {
                     FlowTaskResult currFlowTaskResult = GsonUtil.fromJson(GsonUtil.toJson(setupMap.get(task.getTaskDefinitionKey())), FlowTaskResult.class);
                     map = this.getFlowFormPropertie(flowResult, map, currFlowTaskResult.getSetup());
                 }
-                formPropertyList.add(new FormPropertyBean(Long.parseLong(t.getProcessInstanceId()), Long.parseLong(t.getId()), userId, (FlowTaskResult) map.get(SystemConstant.FORM_PROPERTIES)));
+                TFFlowApprove tfFlowApprove = tfFlowApproveService.getOne(new QueryWrapper<TFFlowApprove>().lambda().eq(TFFlowApprove::getFlowId, Long.parseLong(t.getProcessInstanceId())));
+                Optional.ofNullable(tfFlowApprove).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("流程没有审批数据！"));
+
+                formPropertyList.add(new FormPropertyBean(Long.parseLong(t.getProcessInstanceId()), Long.parseLong(t.getId()), userId, (FlowTaskResult) map.get(SystemConstant.FORM_PROPERTIES), tfFlowApprove.getStatus(), String.valueOf(tfCustomFlowEntity.getId())));
             }
         }
         return formPropertyList;

sop-business/src/main/java/com/qmth/sop/business/bean/bean/FormPropertyBean.java

@@ -4,9 +4,11 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.sop.business.bean.result.FlowTaskResult;
+import com.qmth.sop.common.enums.FlowStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 /**
  * @Description: 流程表单属性bean
@@ -22,6 +24,12 @@ public class FormPropertyBean implements Serializable {
     @JsonSerialize(using = ToStringSerializer.class)
     Long flowId;
 
+    @ApiModelProperty(value = "流程状态")
+    FlowStatusEnum status;
+
+    @ApiModelProperty(value = "流程状态")
+    String statusStr;
+
     @ApiModelProperty(value = "sopid")
     String sopId;
 
@@ -46,11 +54,33 @@ public class FormPropertyBean implements Serializable {
         this.setupMap = setupMap;
     }
 
-    public FormPropertyBean(Long flowId, Long taskId, Long userId, FlowTaskResult setupMap) {
+    public FormPropertyBean(Long flowId, Long taskId, Long userId, FlowTaskResult setupMap, FlowStatusEnum status, String sopId) {
         this.flowId = flowId;
         this.taskId = taskId;
         this.userId = userId;
         this.setupMap = setupMap;
+        this.status = status;
+        this.sopId = sopId;
+    }
+
+    public String getStatusStr() {
+        if (Objects.nonNull(status)) {
+            return this.status.getTitle();
+        } else {
+            return statusStr;
+        }
+    }
+
+    public void setStatusStr(String statusStr) {
+        this.statusStr = statusStr;
+    }
+
+    public FlowStatusEnum getStatus() {
+        return status;
+    }
+
+    public void setStatus(FlowStatusEnum status) {
+        this.status = status;
     }
 
     public String getSopId() {

sop-server/src/main/java/com/qmth/sop/server/api/ActivitiFromHtmlController.java

@@ -75,7 +75,7 @@ public class ActivitiFromHtmlController {
             formDataMap.put(key, value[0]);
         }
         map.putAll(formDataMap);
-        map = activitiService.taskApprove(flowDeploymentId, approve, Objects.nonNull(taskId) ? Long.parseLong(taskId) : null, formProperties, approveUserIds, approveRemark, map);
+        activitiService.taskApprove(flowDeploymentId, approve, Objects.nonNull(taskId) ? Long.parseLong(taskId) : null, formProperties, approveUserIds, approveRemark, map);
         return ResultUtil.ok(true);
     }