自定义流程接口新增

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

@@ -0,0 +1,189 @@
+package com.qmth.distributed.print.business.bean.result;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.teachcloud.common.enums.FlowApproveSetupEnum;
+import com.qmth.teachcloud.common.enums.FlowStatusEnum;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+/**
+ * @Description: 流程审批列表
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2022/2/21
+ */
+public class FlowApproveListResult implements Serializable {
+
+    @ApiModelProperty(value = "流程审批id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    @ApiModelProperty(value = "流程id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long flowId;
+
+    @ApiModelProperty(value = "自定义流程实体id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long flowEntityId;
+
+    @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 String pendApproveId;
+
+    @ApiModelProperty(value = "创建时间")
+    private Long createTime;
+
+    @ApiModelProperty(value = "提交人")
+    private String teacherUserName;
+
+    @ApiModelProperty(value = "下一级处理人id/当前处理人")
+    private String pendApproveUserName;
+
+    @ApiModelProperty(value = "状态，START：待审批，AUDITING：审核中，REJECT：已驳回，END：已终止，FINISH：已结束")
+    private FlowStatusEnum status;
+
+    @ApiModelProperty(value = "状态，START：待审批，AUDITING：审核中，REJECT：已驳回，END：已终止，FINISH：已结束")
+    private String statusStr;
+
+    @ApiModelProperty(value = "当前节点")
+    private Integer setup;
+
+    @ApiModelProperty(value = "当前节点")
+    private String setupStr;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getFlowId() {
+        return flowId;
+    }
+
+    public void setFlowId(Long flowId) {
+        this.flowId = flowId;
+    }
+
+    public Long getFlowEntityId() {
+        return flowEntityId;
+    }
+
+    public void setFlowEntityId(Long flowEntityId) {
+        this.flowEntityId = flowEntityId;
+    }
+
+    public Long getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(Long taskId) {
+        this.taskId = taskId;
+    }
+
+    public String getPendApproveId() {
+        return pendApproveId;
+    }
+
+    public void setPendApproveId(String pendApproveId) {
+        this.pendApproveId = pendApproveId;
+    }
+
+    public Long getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Long createTime) {
+        this.createTime = createTime;
+    }
+
+    public Long getTeacherId() {
+        return teacherId;
+    }
+
+    public void setTeacherId(Long teacherId) {
+        this.teacherId = teacherId;
+    }
+
+    public String getTeacherUserName() {
+        return teacherUserName;
+    }
+
+    public void setTeacherUserName(String teacherUserName) {
+        this.teacherUserName = teacherUserName;
+    }
+
+    public String getPendApproveUserName() {
+        return pendApproveUserName;
+    }
+
+    public void setPendApproveUserName(String pendApproveUserName) {
+        this.pendApproveUserName = pendApproveUserName;
+    }
+
+    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;
+    }
+
+    public Integer getSetup() {
+        return setup;
+    }
+
+    public void setSetup(Integer setup) {
+        this.setup = setup;
+    }
+
+    public String getSetupStr() {
+        if (Objects.nonNull(setup)) {
+            switch (setup.intValue()) {
+                case 1:
+                    this.setupStr = FlowApproveSetupEnum.SUBMIT.getRemark();
+                    break;
+                case 0:
+                    this.setupStr = FlowApproveSetupEnum.FINISH.getRemark();
+                    break;
+                case -1:
+                    this.setupStr = FlowApproveSetupEnum.END.getRemark();
+                    break;
+                default:
+                    this.setupStr = FlowApproveSetupEnum.APPROVE.getRemark();
+                    break;
+            }
+        }
+        return setupStr;
+    }
+
+    public void setSetupStr(String setupStr) {
+        this.setupStr = setupStr;
+    }
+}

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

@@ -1,5 +1,7 @@
 package com.qmth.distributed.print.business.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.teachcloud.common.contant.SystemConstant;
@@ -25,6 +27,10 @@ public class TExamTaskFlow implements Serializable {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
+    @ApiModelProperty(value = "自定义流程实体id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long flowEntityId;
+
     @ApiModelProperty(value = "考试任务id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long taskId;
@@ -36,15 +42,51 @@ public class TExamTaskFlow implements Serializable {
     @ApiModelProperty(value = "流程等级")
     private Integer level;
 
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("create_id")
+    @ApiModelProperty(value = "创建人")
+    private Long createId;
+
+    @TableField(value = "create_time", fill = FieldFill.INSERT)//新增执行
+    @ApiModelProperty(value = "创建时间")
+    private Long createTime;
+
     public TExamTaskFlow() {
 
     }
 
-    public TExamTaskFlow(Long taskId, Long flowId, Integer level) {
+    public TExamTaskFlow(Long flowEntityId, Long taskId, Long flowId, Integer level, Long userId) {
         setId(SystemConstant.getDbUuid());
+        this.flowEntityId = flowEntityId;
         this.taskId = taskId;
         this.flowId = flowId;
         this.level = level;
+        this.createId = userId;
+        this.createTime = System.currentTimeMillis();
+    }
+
+    public Long getCreateId() {
+        return createId;
+    }
+
+    public void setCreateId(Long createId) {
+        this.createId = createId;
+    }
+
+    public Long getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Long createTime) {
+        this.createTime = createTime;
+    }
+
+    public Long getFlowEntityId() {
+        return flowEntityId;
+    }
+
+    public void setFlowEntityId(Long flowEntityId) {
+        this.flowEntityId = flowEntityId;
     }
 
     public static long getSerialVersionUID() {

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

@@ -42,7 +42,7 @@ public class TFFlowApprove extends BaseEntity implements Serializable {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long approveId;
 
-    @ApiModelProperty(value = "状态，START：已开始，AUDITING：审核中，REJECT：已驳回，END：已终止，FINISH：已结束")
+    @ApiModelProperty(value = "状态，START：待审批，AUDITING：审核中，REJECT：已驳回，END：已终止，FINISH：已结束")
     private FlowStatusEnum status;
 
     @ApiModelProperty(value = "计划步骤")

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

@@ -1,9 +1,13 @@
 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.FlowApproveListResult;
 import com.qmth.distributed.print.business.entity.TFFlowApprove;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Map;
+
 /**
  * <p>
  * 流程审核表 Mapper 接口
@@ -22,4 +26,28 @@ public interface TFFlowApproveMapper extends BaseMapper<TFFlowApprove> {
      * @return
      */
     TFFlowApprove findByFlowId(@Param("flowId") Long flowId, @Param("schoolId") Long schoolId);
+
+    /**
+     * 查找流程审批记录列表
+     *
+     * @param iPage
+     * @param status
+     * @param createUserName
+     * @param teachingRoomId
+     * @param startTime
+     * @param endTime
+     * @param pendApproveUserName
+     * @param schoolId
+     * @param orgId
+     * @return
+     */
+    public IPage<FlowApproveListResult> findApproveList(IPage<Map> iPage,
+                                                        @Param("status") String status,
+                                                        @Param("createUserName") String createUserName,
+                                                        @Param("teachingRoomId") Long teachingRoomId,
+                                                        @Param("startTime") Long startTime,
+                                                        @Param("endTime") Long endTime,
+                                                        @Param("pendApproveUserName") String pendApproveUserName,
+                                                        @Param("schoolId") Long schoolId,
+                                                        @Param("orgId") Long orgId);
 }

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

@@ -1,7 +1,12 @@
 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.FlowApproveListResult;
 import com.qmth.distributed.print.business.entity.TFFlowApprove;
+import com.qmth.teachcloud.common.enums.FlowStatusEnum;
+
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +26,28 @@ public interface TFFlowApproveService extends IService<TFFlowApprove> {
      * @return
      */
     TFFlowApprove findByFlowId(Long flowId, Long schoolId);
+
+    /**
+     * 查找流程审批记录列表
+     *
+     * @param iPage
+     * @param status
+     * @param createUserName
+     * @param teachingRoomId
+     * @param startTime
+     * @param endTime
+     * @param pendApproveUserName
+     * @param schoolId
+     * @param orgId
+     * @return
+     */
+    public IPage<FlowApproveListResult> findApproveList(IPage<Map> iPage,
+                                                        FlowStatusEnum status,
+                                                        String createUserName,
+                                                        Long teachingRoomId,
+                                                        Long startTime,
+                                                        Long endTime,
+                                                        String pendApproveUserName,
+                                                        Long schoolId,
+                                                        Long orgId);
 }

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

@@ -337,7 +337,9 @@ public class ActivitiServiceImpl implements ActivitiService {
         examTask.setFlowId(SystemConstant.convertIdToLong(flowId));
         examTaskService.updateById(examTask);
 
+        String id = (String) map.get(SystemConstant.FLOW_ENTITY_ID);
         TExamTaskFlow tExamTaskFlow = tExamTaskFlowService.findByFlowLevel(examTaskId);
+        tExamTaskFlow.setFlowEntityId(SystemConstant.convertIdToLong(id));
         tExamTaskFlow.setFlowId(SystemConstant.convertIdToLong(flowId));
         tExamTaskFlowService.updateById(tExamTaskFlow);
 
@@ -2047,7 +2049,6 @@ public class ActivitiServiceImpl implements ActivitiService {
                 }
             }
         }
-        flowProcessVarMap.put(SystemConstant.VERSION, version);
         //生成图像信息
         new BpmnAutoLayout(model).execute();
 
@@ -2217,6 +2218,7 @@ public class ActivitiServiceImpl implements ActivitiService {
         map.computeIfAbsent(SystemConstant.APPROVE_ID, v -> String.valueOf(approveId));
         map.computeIfAbsent(SystemConstant.EXAM_TASK_ID, v -> taskId);
         map.computeIfAbsent(SystemConstant.CUSTOM_FLOW_ID, v -> tfCustomFlow.getId());
+        map.computeIfAbsent(SystemConstant.VERSION, v -> tfCustomFlow.getVersion());
         this.flowStart(map);
 
         tfCustomFlow.setActFlowId((String) map.get(SystemConstant.PROCESS_DEFINITION_ID));

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

@@ -59,7 +59,8 @@ public class TExamTaskFlowServiceImpl extends ServiceImpl<TExamTaskFlowMapper, T
             taskFlowQueryWrapper.lambda().eq(TExamTaskFlow::getTaskId, taskId);
             List<TExamTaskFlow> tExamTaskFlowList = this.list(taskFlowQueryWrapper);
             if (Objects.isNull(tExamTaskFlowList) || tExamTaskFlowList.size() == 0) {
-                TExamTaskFlow tExamTaskFlow = new TExamTaskFlow(taskId, flowId, 1);
+//                TExamTaskFlow tExamTaskFlow = new TExamTaskFlow(taskId, flowId, 1);
+                TExamTaskFlow tExamTaskFlow = null;
                 this.save(tExamTaskFlow);
             } else if (Objects.nonNull(tExamTaskFlowList) && tExamTaskFlowList.size() == 1) {
                 Map<String, List<String>> flowSchoolCodeMap = SystemConstant.getFlowSchoolCodeMap();
@@ -67,7 +68,8 @@ public class TExamTaskFlowServiceImpl extends ServiceImpl<TExamTaskFlowMapper, T
                 if (flowSchoolCodeMap.get(SystemConstant.GDYKDX_FLOW_KEY).contains(basicSchool.getCode())) {
                     TExamTaskFlow tExamTaskFlow = tExamTaskFlowList.get(0);
                     Integer level = tExamTaskFlow.getLevel();
-                    TExamTaskFlow tExamTaskFlowSub = new TExamTaskFlow(taskId, flowId, ++level);
+                    TExamTaskFlow tExamTaskFlowSub = null;
+//                    TExamTaskFlow tExamTaskFlowSub = new TExamTaskFlow(taskId, flowId, ++level);
                     this.save(tExamTaskFlowSub);
                 }
             }

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

@@ -1,13 +1,17 @@
 package com.qmth.distributed.print.business.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.distributed.print.business.bean.result.FlowApproveListResult;
 import com.qmth.distributed.print.business.entity.TFFlowApprove;
 import com.qmth.distributed.print.business.mapper.TFFlowApproveMapper;
 import com.qmth.distributed.print.business.service.TFFlowApproveService;
+import com.qmth.teachcloud.common.enums.FlowStatusEnum;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Map;
+import java.util.Objects;
 
 /**
  * <p>
@@ -33,4 +37,31 @@ public class TFFlowApproveServiceImpl extends ServiceImpl<TFFlowApproveMapper, T
     public TFFlowApprove findByFlowId(Long flowId, Long schoolId) {
         return tfFlowApproveMapper.findByFlowId(flowId, schoolId);
     }
+
+    /**
+     * 查找流程审批记录列表
+     *
+     * @param iPage
+     * @param status
+     * @param createUserName
+     * @param teachingRoomId
+     * @param startTime
+     * @param endTime
+     * @param pendApproveUserName
+     * @param schoolId
+     * @param orgId
+     * @return
+     */
+    @Override
+    public IPage<FlowApproveListResult> findApproveList(IPage<Map> iPage, FlowStatusEnum status, String createUserName, Long teachingRoomId, Long startTime, Long endTime, String pendApproveUserName, Long schoolId, Long orgId) {
+        return tfFlowApproveMapper.findApproveList(iPage,
+                Objects.nonNull(status) ? status.name() : null,
+                createUserName,
+                teachingRoomId,
+                startTime,
+                endTime,
+                pendApproveUserName,
+                schoolId,
+                orgId);
+    }
 }

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

@@ -11,4 +11,91 @@
             and t.`level` = 1 and tffa.school_id = #{schoolId} and tffa.flow_id = t.flow_id
             )
     </select>
+
+    <select id="findApproveList" resultType="com.qmth.distributed.print.business.bean.result.FlowApproveListResult">
+        select temp.*
+        from
+        (
+        select
+        t.*,
+        tffl.pend_approve_id as pendApproveId,
+        tffl.task_id as taskId,
+        (
+        select
+        group_concat(su.real_name)
+        from
+        sys_user su
+        where
+        FIND_IN_SET(su.id,replace(tffl.pend_approve_id,', ',','))) as pendApproveUserName
+        from
+        (
+        select
+        tffa.id,
+        et.user_id as teacherId,
+        (
+        select
+        su.real_name
+        from
+        sys_user su
+        where
+        su.id = et.user_id) as teacherUserName,
+        tffa.create_time as createTime,
+        tffa.status,
+        tffa.setup,
+        tfcfe.id as flowEntityId,
+        tffa.flow_id as flowId,
+        (
+        select
+        tffl.id
+        from
+        t_f_flow_log tffl
+        where
+        tffl.flow_id = tffa.flow_id
+        order by
+        tffl.create_time desc
+        limit 1) as flowLogId
+        from
+        t_f_flow_approve tffa
+        join t_f_custom_flow_entity tfcfe on
+        tfcfe.flow_id = tffa.flow_id
+        join exam_task et on
+        et.flow_id = tffa.flow_id
+        <where>
+            <if test="schoolId != null and schoolId != ''">
+                and tffa.school_id = #{schoolId}
+            </if>
+            <if test="orgId != null and orgId != ''">
+                and tffa.org_id = #{orgId}
+            </if>
+            <if test="teachingRoomId != null and teachingRoomId != ''">
+                and et.teaching_room_id = #{teachingRoomId}
+            </if>
+             and (tffa.status <![CDATA[ <> ]]> 'START'
+            <if test="status != null and status != ''">
+                 or tffa.status = #{status}
+            </if>)
+            <if test="startTime != null and startTime != ''">
+                and tffa.create_time <![CDATA[ >= ]]> #{startTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and tffa.create_time <![CDATA[ < ]]> #{endTime}
+            </if>
+            and tffa.enable = 1
+            and et.enable = 1
+        </where>
+        ) t
+        join t_f_flow_log tffl on
+        tffl.id = t.flowLogId
+        <where>
+            <if test="createUserName != null and createUserName != ''">
+                and t.teacherUserName like concat('%',#{createUserName},'%')
+            </if>
+        </where>
+         ) temp
+        <where>
+            <if test="pendApproveUserName != null and pendApproveUserName != ''">
+                and temp.pendApproveUserName like concat('%',#{pendApproveUserName},'%')
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -9,6 +9,7 @@ import com.qmth.boot.api.exception.ApiException;
 import com.qmth.distributed.print.business.bean.flow.CustomFlowSaveDto;
 import com.qmth.distributed.print.business.bean.params.FlowTaskApproveParam;
 import com.qmth.distributed.print.business.bean.params.customFlowParam;
+import com.qmth.distributed.print.business.bean.result.FlowApproveListResult;
 import com.qmth.distributed.print.business.bean.result.FlowTaskApprovePeopleAllResult;
 import com.qmth.distributed.print.business.bean.result.FlowTaskResult;
 import com.qmth.distributed.print.business.entity.TFCustomFlow;
@@ -199,20 +200,22 @@ public class TFCustomFlowController {
     }
 
     @ApiOperation(value = "流程审批记录列表")
-    @ApiResponses({@ApiResponse(code = 200, message = "流程审批记录信息", response = ResultUtil.class)})
+    @ApiResponses({@ApiResponse(code = 200, message = "流程审批记录信息", response = FlowApproveListResult.class)})
     @RequestMapping(value = "/approve/list", method = RequestMethod.POST)
     public Result taskApproveList(@ApiParam(value = "状态", required = false) @RequestParam(required = false) FlowStatusEnum status,
                                   @ApiParam(value = "提交人名称", required = false) @RequestParam(required = false) String createUserName,
-                                  @ApiParam(value = "教研室", required = false) @RequestParam(required = false) Long teachingRoomId,
+                                  @ApiParam(value = "教研室", required = false) @RequestParam(required = false) String teachingRoomId,
                                   @ApiParam(value = "提交开始时间", required = false) @RequestParam(required = false) Long startTime,
                                   @ApiParam(value = "提交结束时间", required = false) @RequestParam(required = false) Long endTime,
+                                  @ApiParam(value = "提交人名称", required = false) @RequestParam(required = false) String pendApproveUserName,
                                   @ApiParam(value = "页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                                   @ApiParam(value = "数量", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        return ResultUtil.ok(true);
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        return ResultUtil.ok(tfFlowApproveService.findApproveList(new Page<>(pageNumber, pageSize), status, createUserName, SystemConstant.convertIdToLong(teachingRoomId), startTime, endTime, pendApproveUserName, sysUser.getSchoolId(), sysUser.getOrgId()));
     }
 
     @ApiOperation(value = "流程列表")
-    @ApiResponses({@ApiResponse(code = 200, message = "流程信息", response = ResultUtil.class)})
+    @ApiResponses({@ApiResponse(code = 200, message = "流程信息", response = TFCustomFlow.class)})
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     public Result list(@ApiParam(value = "流程名称", required = false) @RequestParam(required = false) String name,
                        @ApiParam(value = "页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
@@ -250,6 +253,15 @@ public class TFCustomFlowController {
         return ResultUtil.ok(tfCustomFlowService.updateById(tfCustomFlow));
     }
 
+    @ApiOperation(value = "流程审批记录逻辑查看")
+    @ApiResponses({@ApiResponse(code = 200, message = "流程信息", response = ResultUtil.class)})
+    @RequestMapping(value = "/view", method = RequestMethod.POST)
+    public Result view(@ApiParam(value = "自定义流程实体id", required = true) @RequestParam String flowEntityId) {
+        TFCustomFlowEntity tfCustomFlowEntity = tfCustomFlowEntityService.getById(SystemConstant.convertIdToLong(flowEntityId));
+        Optional.ofNullable(tfCustomFlowEntity).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("自定义流程实体数据为空"));
+        return ResultUtil.ok(true);
+    }
+
     @ApiOperation(value = "流程审批记录逻辑删除")
     @ApiResponses({@ApiResponse(code = 200, message = "常规信息", response = ResultUtil.class)})
     @RequestMapping(value = "/approve/enable", method = RequestMethod.POST)

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

@@ -11,21 +11,23 @@ import java.util.Objects;
  */
 public enum FlowApproveSetupEnum {
 
-    SUBMIT("提交试卷", "usertask1", 1, "命题老师"),
+    SUBMIT("提交试卷", "usertask1", 1, "开始节点"),
 
     END("已终止", null, -1, "终止"),
 
-    FINISH("已结束", null, 0, "结束");
+    FINISH("已结束", null, 0, "结束节点"),
+
+    APPROVE("审批中", null, null, "审批节点");
 
     private String title;
 
     private String id;
 
-    private int setup;
+    private Integer setup;
 
     private String remark;
 
-    private FlowApproveSetupEnum(String title, String id, int setup, String remark) {
+    private FlowApproveSetupEnum(String title, String id, Integer setup, String remark) {
         this.title = title;
         this.id = id;
         this.setup = setup;
@@ -40,7 +42,7 @@ public enum FlowApproveSetupEnum {
         return id;
     }
 
-    public int getSetup() {
+    public Integer getSetup() {
         return setup;
     }