流程修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/TaskApproveResult.java

@@ -0,0 +1,197 @@
+package com.qmth.distributed.print.business.bean.result;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.teachcloud.common.enums.FlowStatusEnum;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+/**
+ * @Description: 流程审批列表result
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2021/8/5
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class TaskApproveResult implements Serializable {
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "流程id")
+    private Long flowId;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "学校id")
+    private Long schoolId;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "机构id")
+    private Long orgId;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "命题任务id")
+    private Long taskId;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "发起人id")
+    private Long teacherId;
+
+    @ApiModelProperty(value = "发起人名称")
+    private String teacherName;
+
+    @ApiModelProperty(value = "创建时间")
+    private Long createTime;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "一级审核人id")
+    private Long primaryApproveId;
+
+    @ApiModelProperty(value = "一级审核人名称")
+    private String primaryApproveName;
+
+    @ApiModelProperty(value = "一级审核人意见")
+    private String primaryApproveRemark;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "二级审核人id")
+    private Long secondApproveId;
+
+    @ApiModelProperty(value = "二级审核人名称")
+    private String secondApproveName;
+
+    @ApiModelProperty(value = "二级审核人意见")
+    private String secondApproveRemark;
+
+    @ApiModelProperty(value = "流程状态")
+    private FlowStatusEnum status;
+
+    @ApiModelProperty(value = "流程状态")
+    private String statusStr;
+
+    public Long getFlowId() {
+        return flowId;
+    }
+
+    public void setFlowId(Long flowId) {
+        this.flowId = flowId;
+    }
+
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public Long getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
+
+    public Long getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(Long taskId) {
+        this.taskId = taskId;
+    }
+
+    public Long getTeacherId() {
+        return teacherId;
+    }
+
+    public void setTeacherId(Long teacherId) {
+        this.teacherId = teacherId;
+    }
+
+    public String getTeacherName() {
+        return teacherName;
+    }
+
+    public void setTeacherName(String teacherName) {
+        this.teacherName = teacherName;
+    }
+
+    public Long getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Long createTime) {
+        this.createTime = createTime;
+    }
+
+    public Long getPrimaryApproveId() {
+        return primaryApproveId;
+    }
+
+    public void setPrimaryApproveId(Long primaryApproveId) {
+        this.primaryApproveId = primaryApproveId;
+    }
+
+    public String getPrimaryApproveName() {
+        return primaryApproveName;
+    }
+
+    public void setPrimaryApproveName(String primaryApproveName) {
+        this.primaryApproveName = primaryApproveName;
+    }
+
+    public String getPrimaryApproveRemark() {
+        return primaryApproveRemark;
+    }
+
+    public void setPrimaryApproveRemark(String primaryApproveRemark) {
+        this.primaryApproveRemark = primaryApproveRemark;
+    }
+
+    public Long getSecondApproveId() {
+        return secondApproveId;
+    }
+
+    public void setSecondApproveId(Long secondApproveId) {
+        this.secondApproveId = secondApproveId;
+    }
+
+    public String getSecondApproveName() {
+        return secondApproveName;
+    }
+
+    public void setSecondApproveName(String secondApproveName) {
+        this.secondApproveName = secondApproveName;
+    }
+
+    public String getSecondApproveRemark() {
+        return secondApproveRemark;
+    }
+
+    public void setSecondApproveRemark(String secondApproveRemark) {
+        this.secondApproveRemark = secondApproveRemark;
+    }
+
+    public FlowStatusEnum getStatus() {
+        return status;
+    }
+
+    public void setStatus(FlowStatusEnum status) {
+        this.status = status;
+    }
+
+    public String getStatusStr() {
+        if (Objects.nonNull(status)) {
+            return status.getTitle();
+        } else {
+            return statusStr;
+        }
+    }
+
+    public void setStatusStr(String statusStr) {
+        this.statusStr = statusStr;
+    }
+}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/WorkResult.java

@@ -8,6 +8,7 @@ import com.qmth.teachcloud.common.enums.FlowStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 /**
  * @Description: 工作台 result
@@ -42,7 +43,8 @@ public class WorkResult implements Serializable {
     String cardRuleName;
 
     @ApiModelProperty(value = "用户ID")
-    String userId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    Long userId;
 
     @ApiModelProperty(value = "用户名称")
     String userName;
@@ -53,13 +55,17 @@ public class WorkResult implements Serializable {
     @ApiModelProperty(value = "命题结束时间")
     Long endTime;
 
-    @ApiModelProperty(value = "状态")
+    @ApiModelProperty(value = "流程状态")
     FlowStatusEnum status;
 
+    @ApiModelProperty(value = "流程状态")
+    String statusStr;
+
     @ApiModelProperty(value = "剩余天数")
     Integer remainCount;
 
     @ApiModelProperty(value = "提交人")
+    @JsonSerialize(using = ToStringSerializer.class)
     Long createId;
 
     @ApiModelProperty(value = "提交时间")
@@ -71,11 +77,13 @@ public class WorkResult implements Serializable {
     @ApiModelProperty(value = "当前服务器时间")
     Long systemCurrentTime;
 
+    @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "执行id")
-    String executionId;
+    Long executionId;
 
-    @ApiModelProperty(value = "流程实例id")
-    String flowId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "流程id")
+    Long flowId;
 
     @ApiModelProperty(value = "任务节点名称")
     String taskName;
@@ -83,12 +91,25 @@ public class WorkResult implements Serializable {
     @ApiModelProperty(value = "任务节点key")
     String taskDefKey;
 
+    @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "任务节点id")
-    String taskId;
+    Long taskId;
 
     @ApiModelProperty(value = "流程步骤")
     Integer setup;
 
+    public String getStatusStr() {
+        if (Objects.nonNull(status)) {
+            return status.getTitle();
+        } else {
+            return statusStr;
+        }
+    }
+
+    public void setStatusStr(String statusStr) {
+        this.statusStr = statusStr;
+    }
+
     public Integer getSetup() {
         return setup;
     }
@@ -105,22 +126,6 @@ public class WorkResult implements Serializable {
         this.status = status;
     }
 
-    public String getFlowId() {
-        return flowId;
-    }
-
-    public void setFlowId(String flowId) {
-        this.flowId = flowId;
-    }
-
-    public String getExecutionId() {
-        return executionId;
-    }
-
-    public void setExecutionId(String executionId) {
-        this.executionId = executionId;
-    }
-
     public String getTaskName() {
         return taskName;
     }
@@ -137,14 +142,6 @@ public class WorkResult implements Serializable {
         this.taskDefKey = taskDefKey;
     }
 
-    public String getTaskId() {
-        return taskId;
-    }
-
-    public void setTaskId(String taskId) {
-        this.taskId = taskId;
-    }
-
     public Long getId() {
         return id;
     }
@@ -201,14 +198,6 @@ public class WorkResult implements Serializable {
         this.cardRuleName = cardRuleName;
     }
 
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-
     public String getUserName() {
         return userName;
     }
@@ -272,4 +261,36 @@ public class WorkResult implements Serializable {
     public void setSystemCurrentTime(Long systemCurrentTime) {
         this.systemCurrentTime = systemCurrentTime;
     }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Long getExecutionId() {
+        return executionId;
+    }
+
+    public void setExecutionId(Long executionId) {
+        this.executionId = executionId;
+    }
+
+    public Long getFlowId() {
+        return flowId;
+    }
+
+    public void setFlowId(Long flowId) {
+        this.flowId = flowId;
+    }
+
+    public Long getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(Long taskId) {
+        this.taskId = taskId;
+    }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/TFFlowApproveLog.java

@@ -0,0 +1,143 @@
+package com.qmth.distributed.print.business.entity;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.teachcloud.common.base.BaseEntity;
+import com.qmth.teachcloud.common.enums.FlowApproveOperationEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 流程审批记录
+ * </p>
+ *
+ * @author wangliang
+ * @since 2021-08-05
+ */
+@ApiModel(value = "TFFlowApproveLog对象", description = "流程审批记录")
+public class TFFlowApproveLog extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "流程id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long flowId;
+
+    @ApiModelProperty(value = "命题任务id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long taskId;
+
+    @ApiModelProperty(value = "发起人id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long teacherId;
+
+    @ApiModelProperty(value = "一级审核人id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long primaryApproveId;
+
+    @ApiModelProperty(value = "一级审核人意见")
+    private String primaryApproveRemark;
+
+    @ApiModelProperty(value = "一级审核人操作，SUBMIT：提交，APPROVE：审批，REJECT：驳回，END：终止")
+    private FlowApproveOperationEnum primaryApproveOperation;
+
+    @ApiModelProperty(value = "二级审核人id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long secondApproveId;
+
+    @ApiModelProperty(value = "二级审核人意见")
+    private String secondApproveRemark;
+
+    @ApiModelProperty(value = "二级审核人操作，SUBMIT：提交，APPROVE：审批，REJECT：驳回，END：终止")
+    private FlowApproveOperationEnum secondApproveOperation;
+
+    @ApiModelProperty(value = "是否启用，0：停用，1：启用")
+    private Boolean enable;
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public Long getFlowId() {
+        return flowId;
+    }
+
+    public void setFlowId(Long flowId) {
+        this.flowId = flowId;
+    }
+
+    public Long getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(Long taskId) {
+        this.taskId = taskId;
+    }
+
+    public Long getTeacherId() {
+        return teacherId;
+    }
+
+    public void setTeacherId(Long teacherId) {
+        this.teacherId = teacherId;
+    }
+
+    public Long getPrimaryApproveId() {
+        return primaryApproveId;
+    }
+
+    public void setPrimaryApproveId(Long primaryApproveId) {
+        this.primaryApproveId = primaryApproveId;
+    }
+
+    public String getPrimaryApproveRemark() {
+        return primaryApproveRemark;
+    }
+
+    public void setPrimaryApproveRemark(String primaryApproveRemark) {
+        this.primaryApproveRemark = primaryApproveRemark;
+    }
+
+    public FlowApproveOperationEnum getPrimaryApproveOperation() {
+        return primaryApproveOperation;
+    }
+
+    public void setPrimaryApproveOperation(FlowApproveOperationEnum primaryApproveOperation) {
+        this.primaryApproveOperation = primaryApproveOperation;
+    }
+
+    public Long getSecondApproveId() {
+        return secondApproveId;
+    }
+
+    public void setSecondApproveId(Long secondApproveId) {
+        this.secondApproveId = secondApproveId;
+    }
+
+    public String getSecondApproveRemark() {
+        return secondApproveRemark;
+    }
+
+    public void setSecondApproveRemark(String secondApproveRemark) {
+        this.secondApproveRemark = secondApproveRemark;
+    }
+
+    public FlowApproveOperationEnum getSecondApproveOperation() {
+        return secondApproveOperation;
+    }
+
+    public void setSecondApproveOperation(FlowApproveOperationEnum secondApproveOperation) {
+        this.secondApproveOperation = secondApproveOperation;
+    }
+
+    public Boolean getEnable() {
+        return enable;
+    }
+
+    public void setEnable(Boolean enable) {
+        this.enable = enable;
+    }
+}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/TFFlowApproveLogMapper.java

@@ -0,0 +1,16 @@
+package com.qmth.distributed.print.business.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qmth.distributed.print.business.entity.TFFlowApproveLog;
+
+/**
+ * <p>
+ * 流程审批记录 Mapper 接口
+ * </p>
+ *
+ * @author wangliang
+ * @since 2021-08-05
+ */
+public interface TFFlowApproveLogMapper extends BaseMapper<TFFlowApproveLog> {
+
+}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/TFFlowMapper.java

@@ -2,6 +2,7 @@ package com.qmth.distributed.print.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.qmth.distributed.print.business.bean.result.TaskApproveResult;
 import com.qmth.distributed.print.business.entity.TFFlow;
 import org.apache.ibatis.annotations.Param;
 
@@ -27,4 +28,15 @@ public interface TFFlowMapper extends BaseMapper<TFFlow> {
      * @return
      */
     IPage<TFFlow> list(IPage<Map> iPage, @Param("name") String name, @Param("schoolId") Long schoolId, @Param("orgId") Long orgId);
+
+    /**
+     * 流程审批记录列表
+     *
+     * @param iPage
+     * @param teacherName
+     * @param schoolId
+     * @param orgId
+     * @return
+     */
+    IPage<TaskApproveResult> taskApproveList(IPage<Map> iPage, @Param("teacherName") String teacherName, @Param("schoolId") Long schoolId, @Param("orgId") Long orgId);
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/TFFlowApproveLogService.java

@@ -0,0 +1,16 @@
+package com.qmth.distributed.print.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.distributed.print.business.entity.TFFlowApproveLog;
+
+/**
+ * <p>
+ * 流程审批记录 服务类
+ * </p>
+ *
+ * @author wangliang
+ * @since 2021-08-05
+ */
+public interface TFFlowApproveLogService extends IService<TFFlowApproveLog> {
+
+}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/TFFlowService.java

@@ -2,6 +2,7 @@ package com.qmth.distributed.print.business.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.distributed.print.business.bean.result.TaskApproveResult;
 import com.qmth.distributed.print.business.entity.TFFlow;
 import com.qmth.teachcloud.common.entity.SysRole;
 
@@ -26,5 +27,16 @@ public interface TFFlowService extends IService<TFFlow> {
      * @param orgId
      * @return
      */
-    IPage<TFFlow> list(IPage<Map> iPage, String name, Long schoolId, Long orgId);
+    public IPage<TFFlow> list(IPage<Map> iPage, String name, Long schoolId, Long orgId);
+
+    /**
+     * 流程审批记录列表
+     *
+     * @param iPage
+     * @param teacherName
+     * @param schoolId
+     * @param orgId
+     * @return
+     */
+    public IPage<TaskApproveResult> taskApproveList(IPage<Map> iPage, String teacherName, Long schoolId, Long orgId);
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamTaskServiceImpl.java

@@ -331,12 +331,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                     map.computeIfAbsent(SystemConstant.APPROVE_ID, v -> String.valueOf(examTask.getUserId()));
                     ProcessInstance processInstance = activitiService.startActivity(SystemConstant.GDYKDX_FLOW_KEY, map);
                     examTask.setFlowId(Long.parseLong(processInstance.getId()));
-                } else {//否则走审批流
-
                 }
-//                map.computeIfAbsent(SystemConstant.FLOW_ID, v -> examTask.getFlowId());
-//                map.computeIfAbsent(SystemConstant.FLOW_STATUS, v -> Objects.isNull(examTask.getUserId()) ? FlowStatusEnum.DRAFT : FlowStatusEnum.TO_BE_SUBMIT);
-//                activitiService.flowStart(map);
             }
             this.save(examTask);
         } catch (Exception e) {

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TFFlowApproveLogServiceImpl.java

@@ -0,0 +1,20 @@
+package com.qmth.distributed.print.business.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.distributed.print.business.entity.TFFlowApproveLog;
+import com.qmth.distributed.print.business.mapper.TFFlowApproveLogMapper;
+import com.qmth.distributed.print.business.service.TFFlowApproveLogService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 流程审批记录 服务实现类
+ * </p>
+ *
+ * @author wangliang
+ * @since 2021-08-05
+ */
+@Service
+public class TFFlowApproveLogServiceImpl extends ServiceImpl<TFFlowApproveLogMapper, TFFlowApproveLog> implements TFFlowApproveLogService {
+
+}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TFFlowServiceImpl.java

@@ -2,6 +2,7 @@ package com.qmth.distributed.print.business.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.distributed.print.business.bean.result.TaskApproveResult;
 import com.qmth.distributed.print.business.entity.TFFlow;
 import com.qmth.distributed.print.business.mapper.TFFlowMapper;
 import com.qmth.distributed.print.business.service.TFFlowService;
@@ -37,4 +38,18 @@ public class TFFlowServiceImpl extends ServiceImpl<TFFlowMapper, TFFlow> impleme
     public IPage<TFFlow> list(IPage<Map> iPage, String name, Long schoolId, Long orgId) {
         return tfFlowMapper.list(iPage, name, schoolId, orgId);
     }
+
+    /**
+     * 流程审批记录列表
+     *
+     * @param iPage
+     * @param teacherName
+     * @param schoolId
+     * @param orgId
+     * @return
+     */
+    @Override
+    public IPage<TaskApproveResult> taskApproveList(IPage<Map> iPage, String teacherName, Long schoolId, Long orgId) {
+        return tfFlowMapper.taskApproveList(iPage, teacherName, schoolId, orgId);
+    }
 }

distributed-print-business/src/main/resources/mapper/TFFlowApproveLogMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.qmth.distributed.print.business.mapper.TFFlowApproveLogMapper">
+
+</mapper>

distributed-print-business/src/main/resources/mapper/TFFlowMapper.xml

@@ -16,4 +16,8 @@
             </if>
         </where>
     </select>
+
+    <select id="taskApproveList" resultType="com.qmth.distributed.print.business.bean.result.TaskApproveResult">
+
+    </select>
 </mapper>

distributed-print/src/main/java/com/qmth/distributed/print/api/TFFlowController.java

@@ -7,6 +7,7 @@ import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.boot.api.exception.ApiException;
 import com.qmth.distributed.print.business.bean.result.EditResult;
+import com.qmth.distributed.print.business.bean.result.TaskApproveResult;
 import com.qmth.distributed.print.business.entity.TFFlow;
 import com.qmth.distributed.print.business.service.ActivitiService;
 import com.qmth.distributed.print.business.service.PrintCommonService;
@@ -16,7 +17,6 @@ import com.qmth.teachcloud.common.entity.BasicAttachment;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.FieldUniqueEnum;
-import com.qmth.teachcloud.common.enums.FlowApproveOperationEnum;
 import com.qmth.teachcloud.common.enums.FlowApprovePassEnum;
 import com.qmth.teachcloud.common.enums.UploadFileEnum;
 import com.qmth.teachcloud.common.service.BasicAttachmentService;
@@ -24,8 +24,6 @@ import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import io.swagger.annotations.*;
-import org.activiti.engine.RuntimeService;
-import org.activiti.engine.TaskService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.dao.DuplicateKeyException;
@@ -68,12 +66,6 @@ public class TFFlowController {
     @Resource
     TFFlowService tfFlowService;
 
-    @Resource
-    RuntimeService runtimeService;
-
-    @Resource
-    TaskService taskService;
-
     @ApiOperation(value = "注册流程")
     @Transactional
     @ApiResponses({@ApiResponse(code = 200, message = "用户信息", response = ResultUtil.class)})
@@ -139,17 +131,6 @@ public class TFFlowController {
         return ResultUtil.ok(tfFlowService.list(new Page<>(pageNumber, pageSize), name, SystemConstant.getHeadOrUserSchoolId(), sysUser.getOrgId()));
     }
 
-//    @ApiOperation(value = "启动流程")
-//    @ApiResponses({@ApiResponse(code = 200, message = "用户信息", response = ResultUtil.class)})
-//    @RequestMapping(value = "/start", method = RequestMethod.POST)
-//    public Result start() {
-//        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-//        Map<String, Object> map = new HashMap<>();
-//        map.computeIfAbsent(SystemConstant.APPROVE_ID, v -> String.valueOf(sysUser.getId()));
-//        activitiService.startActivity(SystemConstant.GDYKDX_FLOW_KEY, map);
-//        return ResultUtil.ok();
-//    }
-
     @ApiOperation(value = "审批流程")
     @ApiResponses({@ApiResponse(code = 200, message = "用户信息", response = ResultUtil.class)})
     @RequestMapping(value = "/task/approve", method = RequestMethod.POST)
@@ -165,4 +146,14 @@ public class TFFlowController {
         activitiService.taskApprove(map);
         return ResultUtil.ok();
     }
+
+    @ApiOperation(value = "流程审批记录列表")
+    @ApiResponses({@ApiResponse(code = 200, message = "用户信息", response = TaskApproveResult.class)})
+    @RequestMapping(value = "/task/approve/list", method = RequestMethod.POST)
+    public Result taskApproveList(@ApiParam(value = "发起人名称", required = false) @RequestParam(required = false) String teacherName,
+                                  @ApiParam(value = "页码", required = true) @RequestParam Integer pageNumber,
+                                  @ApiParam(value = "数量", required = true) @RequestParam Integer pageSize) {
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        return ResultUtil.ok(tfFlowService.taskApproveList(new Page<>(pageNumber, pageSize), teacherName, SystemConstant.getHeadOrUserSchoolId(), sysUser.getOrgId()));
+    }
 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/enums/FlowStatusEnum.java

@@ -11,7 +11,7 @@ import java.util.Objects;
  */
 public enum FlowStatusEnum {
 
-    START("START"),
+    START("已开始"),
 
     AUDITING("审核中"),