自定义流程接口-代码整合

distributed-print-business/src/main/java/com/qmth/distributed/print/business/activiti/DirectorApproveByJxzyyListener.java

@@ -1,107 +0,0 @@
-//package com.qmth.distributed.print.business.activiti;
-//
-//import com.google.common.reflect.TypeToken;
-//import com.google.gson.Gson;
-//import com.qmth.distributed.print.business.entity.ExamTask;
-//import com.qmth.distributed.print.business.entity.TFFlowApprove;
-//import com.qmth.distributed.print.business.entity.TFFlowLog;
-//import com.qmth.distributed.print.business.enums.MessageEnum;
-//import com.qmth.distributed.print.business.service.BasicMessageService;
-//import com.qmth.distributed.print.business.service.ExamTaskService;
-//import com.qmth.distributed.print.business.service.TFFlowApproveService;
-//import com.qmth.distributed.print.business.service.TFFlowLogService;
-//import com.qmth.teachcloud.common.bean.params.ApproveUserResult;
-//import com.qmth.teachcloud.common.contant.SpringContextHolder;
-//import com.qmth.teachcloud.common.contant.SystemConstant;
-//import com.qmth.teachcloud.common.entity.SysUser;
-//import com.qmth.teachcloud.common.enums.FlowApproveNameEnum;
-//import com.qmth.teachcloud.common.enums.FlowApproveSetupEnum;
-//import com.qmth.teachcloud.common.enums.FlowStatusEnum;
-//import com.qmth.teachcloud.common.service.SysUserService;
-//import com.qmth.teachcloud.common.util.JacksonUtil;
-//import org.activiti.bpmn.model.BpmnModel;
-//import org.activiti.bpmn.model.FlowNode;
-//import org.activiti.bpmn.model.UserTask;
-//import org.activiti.engine.RepositoryService;
-//import org.activiti.engine.delegate.DelegateTask;
-//import org.activiti.engine.delegate.TaskListener;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//import java.util.Objects;
-//import java.util.stream.Collectors;
-//
-///**
-// * @Description: 教研室主任审批
-// * @Param:
-// * @return:
-// * @Author: wangliang
-// * @Date: 2021/11/10
-// */
-//public class DirectorApproveByJxzyyListener implements TaskListener {
-//    private final static Logger log = LoggerFactory.getLogger(DirectorApproveByJxzyyListener.class);
-//
-//    /**
-//     * 查找同级和以上人员
-//     *
-//     * @param delegateTask
-//     */
-//    @Override
-//    public void notify(DelegateTask delegateTask) {
-//        SysUserService sysUserService = SpringContextHolder.getBean(SysUserService.class);
-//        ExamTaskService examTaskService = SpringContextHolder.getBean(ExamTaskService.class);
-//        BasicMessageService basicMessageService = SpringContextHolder.getBean(BasicMessageService.class);
-//        TFFlowApproveService tfFlowApproveService = SpringContextHolder.getBean(TFFlowApproveService.class);
-//        TFFlowLogService tfFlowLogService = SpringContextHolder.getBean(TFFlowLogService.class);
-//        RepositoryService repositoryService = SpringContextHolder.getBean(RepositoryService.class);
-//
-//        List<Long> approveUserIds = (List<Long>) delegateTask.getVariable(SystemConstant.APPROVE_DIRECTOR_USER_IDS);
-//        Long flowId = SystemConstant.convertIdToLong(delegateTask.getProcessInstanceId());
-//        ExamTask examTask = examTaskService.findByFlowId(flowId);
-//        TFFlowApprove tfFlowApprove = tfFlowApproveService.findByFlowId(flowId, examTask.getSchoolId());
-//        TFFlowLog tfFlowLog = (TFFlowLog) delegateTask.getVariable(SystemConstant.APPROVE_TF_FLOW_LOG);
-//
-//        String currActivityId = delegateTask.getTaskDefinitionKey();
-//        BpmnModel bpmnModel = repositoryService.getBpmnModel(delegateTask.getProcessDefinitionId());
-//        FlowNode currFlow = (UserTask) bpmnModel.getMainProcess().getFlowElement(currActivityId);
-//        UserTask userTask = (UserTask) currFlow;
-//        String approveExchangeUserId = (String) delegateTask.getVariable(SystemConstant.APPROVE_EXCHANGE_USER_ID + userTask.getId());
-//        List<ApproveUserResult> sysUserList = new ArrayList<>();
-//
-//        if (tfFlowApprove.getStatus() == FlowStatusEnum.REJECT && Objects.nonNull(approveExchangeUserId)) {
-//            sysUserList.addAll(sysUserService.findById(Long.parseLong(approveExchangeUserId)));
-//            delegateTask.addCandidateUsers(sysUserList.stream().map(s -> String.valueOf(s.getId())).collect(Collectors.toList()));
-//            tfFlowLog.setPendApproveId(approveExchangeUserId);
-//        } else {
-//            if (Objects.nonNull(approveUserIds) && approveUserIds.size() > 0) {
-//                List<SysUser> sysUsers = sysUserService.listByIds(approveUserIds);
-//                sysUserList = new Gson().fromJson(JacksonUtil.parseJson(sysUsers), new TypeToken<List<ApproveUserResult>>() {
-//                }.getType());
-//                List<String> userIdList = approveUserIds.stream().map(x -> String.valueOf(x)).collect(Collectors.toList());
-//                delegateTask.addCandidateUsers(userIdList);
-//                tfFlowLog.setPendApproveId(String.join(", ", userIdList));
-//            } else {
-//                sysUserList = sysUserService.findByJxzyyDirectorApprove(null, FlowApproveNameEnum.DIRECTOR);
-//                if (Objects.nonNull(sysUserList) && sysUserList.size() > 0) {
-//                    List<String> ids = sysUserList.stream().map(s -> String.valueOf(s.getId())).collect(Collectors.toList());
-//                    //添加或签的人员，一人通过即可进入下一环节
-//                    delegateTask.addCandidateUsers(ids);
-//                    tfFlowLog.setPendApproveId(String.join(", ", ids));
-//                }
-//            }
-//        }
-//        tfFlowLogService.updateById(tfFlowLog);
-//
-//        // 发送审核短信
-//        if (tfFlowApprove.getStatus().equals(FlowStatusEnum.AUDITING)
-//                && tfFlowApprove.getSetup().equals(FlowApproveSetupEnum.PRIMARY_APPROVE.getSetup())) {
-//            basicMessageService.sendNoticeTaskAuditFlow(examTask, sysUserList, MessageEnum.NOTICE_OF_AUDIT_CREATED);
-//        }// 驳回短信（驳回给主任）
-//        else if (tfFlowApprove.getStatus().equals(FlowStatusEnum.REJECT)
-//                && tfFlowApprove.getSetup().equals(FlowApproveSetupEnum.PRIMARY_APPROVE.getSetup())) {
-//            basicMessageService.sendNoticeTaskAuditFlow(examTask, sysUserList, MessageEnum.NOTICE_OF_AUDIT_REJECT);
-//        }
-//    }
-//}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/activiti/DirectorApproveListener.java

@@ -1,105 +0,0 @@
-//package com.qmth.distributed.print.business.activiti;
-//
-//import com.google.common.reflect.TypeToken;
-//import com.google.gson.Gson;
-//import com.qmth.distributed.print.business.entity.ExamTask;
-//import com.qmth.distributed.print.business.entity.TFFlowApprove;
-//import com.qmth.distributed.print.business.entity.TFFlowLog;
-//import com.qmth.distributed.print.business.enums.MessageEnum;
-//import com.qmth.distributed.print.business.service.BasicMessageService;
-//import com.qmth.distributed.print.business.service.ExamTaskService;
-//import com.qmth.distributed.print.business.service.TFFlowApproveService;
-//import com.qmth.distributed.print.business.service.TFFlowLogService;
-//import com.qmth.teachcloud.common.bean.params.ApproveUserResult;
-//import com.qmth.teachcloud.common.contant.SpringContextHolder;
-//import com.qmth.teachcloud.common.contant.SystemConstant;
-//import com.qmth.teachcloud.common.entity.SysUser;
-//import com.qmth.teachcloud.common.enums.FlowApproveSetupEnum;
-//import com.qmth.teachcloud.common.enums.FlowStatusEnum;
-//import com.qmth.teachcloud.common.service.SysUserService;
-//import com.qmth.teachcloud.common.util.JacksonUtil;
-//import org.activiti.bpmn.model.BpmnModel;
-//import org.activiti.bpmn.model.FlowNode;
-//import org.activiti.bpmn.model.UserTask;
-//import org.activiti.engine.RepositoryService;
-//import org.activiti.engine.delegate.DelegateTask;
-//import org.activiti.engine.delegate.TaskListener;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//import java.util.Objects;
-//import java.util.stream.Collectors;
-//
-///**
-// * @Description: 教研室主任审批
-// * @Param:
-// * @return:
-// * @Author: wangliang
-// * @Date: 2021/7/29
-// */
-//public class DirectorApproveListener implements TaskListener {
-//    private final static Logger log = LoggerFactory.getLogger(DirectorApproveListener.class);
-//
-//    /**
-//     * 查找同级和以下人员
-//     *
-//     * @param delegateTask
-//     */
-//    @Override
-//    public void notify(DelegateTask delegateTask) {
-//        SysUserService sysUserService = SpringContextHolder.getBean(SysUserService.class);
-//        ExamTaskService examTaskService = SpringContextHolder.getBean(ExamTaskService.class);
-//        BasicMessageService basicMessageService = SpringContextHolder.getBean(BasicMessageService.class);
-//        TFFlowApproveService tfFlowApproveService = SpringContextHolder.getBean(TFFlowApproveService.class);
-//        TFFlowLogService tfFlowLogService = SpringContextHolder.getBean(TFFlowLogService.class);
-//        RepositoryService repositoryService = SpringContextHolder.getBean(RepositoryService.class);
-//
-//        Long flowId = SystemConstant.convertIdToLong(delegateTask.getProcessInstanceId());
-//        ExamTask examTask = examTaskService.findByFlowId(flowId);
-//        TFFlowApprove tfFlowApprove = tfFlowApproveService.findByFlowId(flowId, examTask.getSchoolId());
-//        TFFlowLog tfFlowLog = (TFFlowLog) delegateTask.getVariable(SystemConstant.APPROVE_TF_FLOW_LOG);
-//
-//        List<Long> approveUserIds = (List<Long>) delegateTask.getVariable(SystemConstant.APPROVE_DIRECTOR_USER_IDS);
-//        String currActivityId = delegateTask.getTaskDefinitionKey();
-//        BpmnModel bpmnModel = repositoryService.getBpmnModel(delegateTask.getProcessDefinitionId());
-//        FlowNode currFlow = (FlowNode) bpmnModel.getMainProcess().getFlowElement(currActivityId);
-//        UserTask userTask = (UserTask) currFlow;
-//        String approveExchangeUserId = (String) delegateTask.getVariable(SystemConstant.APPROVE_EXCHANGE_USER_ID + userTask.getId());
-//        List<ApproveUserResult> sysUserList = new ArrayList<>();
-//        if (tfFlowApprove.getStatus() == FlowStatusEnum.REJECT && Objects.nonNull(approveExchangeUserId)) {
-//            sysUserList.addAll(sysUserService.findById(Long.parseLong(approveExchangeUserId)));
-//            delegateTask.addCandidateUsers(sysUserList.stream().map(s -> String.valueOf(s.getId())).collect(Collectors.toList()));
-//            tfFlowLog.setPendApproveId(approveExchangeUserId);
-//        } else {
-//            if (Objects.nonNull(approveUserIds) && approveUserIds.size() > 0) {
-//                List<SysUser> sysUsers = sysUserService.listByIds(approveUserIds);
-//                sysUserList = new Gson().fromJson(JacksonUtil.parseJson(sysUsers), new TypeToken<List<ApproveUserResult>>() {
-//                }.getType());
-//                List<String> userIdList = approveUserIds.stream().map(x -> String.valueOf(x)).collect(Collectors.toList());
-//                delegateTask.addCandidateUsers(userIdList);
-//                tfFlowLog.setPendApproveId(String.join(", ", userIdList));
-//            } else {
-//                sysUserList = sysUserService.findByDirectorApprove(examTask.getCourseCode(), null);
-//                if (Objects.nonNull(sysUserList) && sysUserList.size() > 0) {
-//                    List<String> ids = sysUserList.stream().map(s -> String.valueOf(s.getId())).collect(Collectors.toList());
-//                    //添加或签的人员，一人通过即可进入下一环节
-//                    delegateTask.addCandidateUsers(ids);
-//                    tfFlowLog.setPendApproveId(String.join(", ", ids));
-//                }
-//            }
-//        }
-//        tfFlowLogService.updateById(tfFlowLog);
-//
-//        // 发送审核短信
-//        if (tfFlowApprove.getStatus().equals(FlowStatusEnum.AUDITING)
-//                && tfFlowApprove.getSetup().equals(FlowApproveSetupEnum.PRIMARY_APPROVE.getSetup())) {
-//            basicMessageService.sendNoticeTaskAuditFlow(examTask, sysUserList, MessageEnum.NOTICE_OF_AUDIT_CREATED);
-//        }// 驳回短信（驳回给主任）
-//        else if (tfFlowApprove.getStatus().equals(FlowStatusEnum.REJECT)
-//                && tfFlowApprove.getSetup().equals(FlowApproveSetupEnum.PRIMARY_APPROVE.getSetup())) {
-//            basicMessageService.sendNoticeTaskAuditFlow(examTask, sysUserList, MessageEnum.NOTICE_OF_AUDIT_REJECT);
-//        }
-//    }
-//}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/activiti/PresidentApproveListener.java

@@ -1,109 +0,0 @@
-//package com.qmth.distributed.print.business.activiti;
-//
-//import com.google.common.reflect.TypeToken;
-//import com.google.gson.Gson;
-//import com.qmth.distributed.print.business.entity.ExamTask;
-//import com.qmth.distributed.print.business.entity.TFFlowApprove;
-//import com.qmth.distributed.print.business.entity.TFFlowLog;
-//import com.qmth.distributed.print.business.enums.MessageEnum;
-//import com.qmth.distributed.print.business.service.BasicMessageService;
-//import com.qmth.distributed.print.business.service.ExamTaskService;
-//import com.qmth.distributed.print.business.service.TFFlowApproveService;
-//import com.qmth.distributed.print.business.service.TFFlowLogService;
-//import com.qmth.teachcloud.common.bean.params.ApproveUserResult;
-//import com.qmth.teachcloud.common.contant.SpringContextHolder;
-//import com.qmth.teachcloud.common.contant.SystemConstant;
-//import com.qmth.teachcloud.common.entity.SysUser;
-//import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-//import com.qmth.teachcloud.common.enums.FlowApproveSetupEnum;
-//import com.qmth.teachcloud.common.enums.FlowStatusEnum;
-//import com.qmth.teachcloud.common.service.SysUserService;
-//import com.qmth.teachcloud.common.util.JacksonUtil;
-//import com.qmth.teachcloud.common.util.ServletUtil;
-//import org.activiti.bpmn.model.BpmnModel;
-//import org.activiti.bpmn.model.FlowNode;
-//import org.activiti.bpmn.model.UserTask;
-//import org.activiti.engine.RepositoryService;
-//import org.activiti.engine.delegate.DelegateTask;
-//import org.activiti.engine.delegate.TaskListener;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//
-//import java.util.ArrayList;
-//import java.util.Arrays;
-//import java.util.List;
-//import java.util.Objects;
-//import java.util.stream.Collectors;
-//
-///**
-// * @Description: 教学院长审批
-// * @Param:
-// * @return:
-// * @Author: wangliang
-// * @Date: 2021/7/29
-// */
-//public class PresidentApproveListener implements TaskListener {
-//    private final static Logger log = LoggerFactory.getLogger(PresidentApproveListener.class);
-//
-//    /**
-//     * 查找同级和以上人员
-//     *
-//     * @param delegateTask
-//     */
-//    @Override
-//    public void notify(DelegateTask delegateTask) {
-//        SysUserService sysUserService = SpringContextHolder.getBean(SysUserService.class);
-//        ExamTaskService examTaskService = SpringContextHolder.getBean(ExamTaskService.class);
-//        BasicMessageService basicMessageService = SpringContextHolder.getBean(BasicMessageService.class);
-//        TFFlowApproveService tfFlowApproveService = SpringContextHolder.getBean(TFFlowApproveService.class);
-//        TFFlowLogService tfFlowLogService = SpringContextHolder.getBean(TFFlowLogService.class);
-//        RepositoryService repositoryService = SpringContextHolder.getBean(RepositoryService.class);
-//
-//        Long flowId = SystemConstant.convertIdToLong(delegateTask.getProcessInstanceId());
-//        ExamTask examTask = examTaskService.findByFlowId(flowId);
-//        TFFlowApprove tfFlowApprove = tfFlowApproveService.findByFlowId(flowId, examTask.getSchoolId());
-//        TFFlowLog tfFlowLog = (TFFlowLog) delegateTask.getVariable(SystemConstant.APPROVE_TF_FLOW_LOG);
-//
-//        List<Long> approveUserIds = (List<Long>) delegateTask.getVariable(SystemConstant.APPROVE_PRESIDENT_USER_IDS);
-//        String currActivityId = delegateTask.getTaskDefinitionKey();
-//        BpmnModel bpmnModel = repositoryService.getBpmnModel(delegateTask.getProcessDefinitionId());
-//        FlowNode currFlow = (FlowNode) bpmnModel.getMainProcess().getFlowElement(currActivityId);
-//        UserTask userTask = (UserTask) currFlow;
-//        String approveExchangeUserId = (String) delegateTask.getVariable(SystemConstant.APPROVE_EXCHANGE_USER_ID + userTask.getId());
-//
-//        List<ApproveUserResult> sysUserList = new ArrayList<>();
-//        if (tfFlowApprove.getStatus() == FlowStatusEnum.REJECT && Objects.nonNull(approveExchangeUserId)) {
-//            sysUserList.addAll(sysUserService.findById(Long.parseLong(approveExchangeUserId)));
-//            delegateTask.addCandidateUsers(sysUserList.stream().map(s -> String.valueOf(s.getId())).collect(Collectors.toList()));
-//            tfFlowLog.setPendApproveId(approveExchangeUserId);
-//        } else {
-//            if (Objects.nonNull(approveUserIds) && approveUserIds.size() > 0) {
-//                List<SysUser> sysUsers = sysUserService.listByIds(approveUserIds);
-//                sysUserList = new Gson().fromJson(JacksonUtil.parseJson(sysUsers), new TypeToken<List<ApproveUserResult>>() {
-//                }.getType());
-//                List<String> userIdList = approveUserIds.stream().map(x -> String.valueOf(x)).collect(Collectors.toList());
-//                delegateTask.addCandidateUsers(userIdList);
-//                tfFlowLog.setPendApproveId(String.join(", ", userIdList));
-//            } else {
-//                SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-//                if (Objects.isNull(sysUser.getOrgId())) {
-//                    throw ExceptionResultEnum.ERROR.exception("审批人机构为空");
-//                }
-//                sysUserList = sysUserService.findByPresidentApprove(Arrays.asList(sysUser.getOrgId()), null);
-//                if (Objects.nonNull(sysUserList) && sysUserList.size() > 0) {
-//                    List<String> ids = sysUserList.stream().map(s -> String.valueOf(s.getId())).collect(Collectors.toList());
-//                    //添加或签的人员，一人通过即可进入下一环节
-//                    delegateTask.addCandidateUsers(ids);
-//                    tfFlowLog.setPendApproveId(String.join(", ", ids));
-//                }
-//            }
-//        }
-//        tfFlowLogService.updateById(tfFlowLog);
-//
-//        // 发送审核短信
-//        if (tfFlowApprove.getStatus().equals(FlowStatusEnum.AUDITING)
-//                && tfFlowApprove.getSetup().equals(FlowApproveSetupEnum.SECOND_APPROVE.getSetup())) {
-//            basicMessageService.sendNoticeTaskAuditFlow(examTask, sysUserList, MessageEnum.NOTICE_OF_AUDIT_CREATED);
-//        }
-//    }
-//}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/activiti/PrintApproveSubListener.java

@@ -1,106 +0,0 @@
-//package com.qmth.distributed.print.business.activiti;
-//
-//import com.google.common.reflect.TypeToken;
-//import com.google.gson.Gson;
-//import com.qmth.distributed.print.business.entity.ExamTask;
-//import com.qmth.distributed.print.business.entity.TFFlowApprove;
-//import com.qmth.distributed.print.business.entity.TFFlowLog;
-//import com.qmth.distributed.print.business.enums.MessageEnum;
-//import com.qmth.distributed.print.business.service.*;
-//import com.qmth.teachcloud.common.bean.params.ApproveUserResult;
-//import com.qmth.teachcloud.common.contant.SpringContextHolder;
-//import com.qmth.teachcloud.common.contant.SystemConstant;
-//import com.qmth.teachcloud.common.entity.SysUser;
-//import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-//import com.qmth.teachcloud.common.enums.FlowApproveSetupEnum;
-//import com.qmth.teachcloud.common.enums.FlowStatusEnum;
-//import com.qmth.teachcloud.common.service.SysUserService;
-//import com.qmth.teachcloud.common.util.JacksonUtil;
-//import com.qmth.teachcloud.common.util.ServletUtil;
-//import org.activiti.bpmn.model.BpmnModel;
-//import org.activiti.bpmn.model.FlowNode;
-//import org.activiti.bpmn.model.UserTask;
-//import org.activiti.engine.RepositoryService;
-//import org.activiti.engine.delegate.DelegateTask;
-//import org.activiti.engine.delegate.TaskListener;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//import java.util.Objects;
-//import java.util.stream.Collectors;
-//
-///**
-// * @Description: 印刷人员审批(子流程)
-// * @Param:
-// * @return:
-// * @Author: wangliang
-// * @Date: 2021/11/19
-// */
-//public class PrintApproveSubListener implements TaskListener {
-//    private final static Logger log = LoggerFactory.getLogger(PrintApproveSubListener.class);
-//
-//    /**
-//     * 查找印刷人员
-//     *
-//     * @param delegateTask
-//     */
-//    @Override
-//    public void notify(DelegateTask delegateTask) {
-//        SysUserService sysUserService = SpringContextHolder.getBean(SysUserService.class);
-//        ExamTaskService examTaskService = SpringContextHolder.getBean(ExamTaskService.class);
-//        BasicMessageService basicMessageService = SpringContextHolder.getBean(BasicMessageService.class);
-//        TFFlowApproveService tfFlowApproveService = SpringContextHolder.getBean(TFFlowApproveService.class);
-//        ActivitiService activitiService = SpringContextHolder.getBean(ActivitiService.class);
-//        TFFlowLogService tfFlowLogService = SpringContextHolder.getBean(TFFlowLogService.class);
-//        RepositoryService repositoryService = SpringContextHolder.getBean(RepositoryService.class);
-//
-//        Long flowId = SystemConstant.convertIdToLong(delegateTask.getProcessInstanceId());
-//        ExamTask examTask = examTaskService.findByFlowId(flowId);
-//        TFFlowApprove tfFlowApprove = tfFlowApproveService.findByFlowId(flowId, examTask.getSchoolId());
-//        TFFlowLog tfFlowLog = (TFFlowLog) delegateTask.getVariable(SystemConstant.APPROVE_TF_FLOW_LOG);
-//
-//        List<Long> approveUserIds = (List<Long>) delegateTask.getVariable(SystemConstant.APPROVE_PRINT_USER_IDS);
-//        String currActivityId = delegateTask.getTaskDefinitionKey();
-//        BpmnModel bpmnModel = repositoryService.getBpmnModel(delegateTask.getProcessDefinitionId());
-//        FlowNode currFlow = (FlowNode) bpmnModel.getMainProcess().getFlowElement(currActivityId);
-//        UserTask userTask = (UserTask) currFlow;
-//        String approveExchangeUserId = (String) delegateTask.getVariable(SystemConstant.APPROVE_EXCHANGE_USER_ID + userTask.getId());
-//
-//        List<ApproveUserResult> sysUserList = new ArrayList<>();
-//        if (tfFlowApprove.getStatus() == FlowStatusEnum.REJECT && Objects.nonNull(approveExchangeUserId)) {
-//            sysUserList.addAll(sysUserService.findById(Long.parseLong(approveExchangeUserId)));
-//            delegateTask.addCandidateUsers(sysUserList.stream().map(s -> String.valueOf(s.getId())).collect(Collectors.toList()));
-//            tfFlowLog.setPendApproveId(approveExchangeUserId);
-//        } else {
-//            if (Objects.nonNull(approveUserIds) && approveUserIds.size() > 0) {
-//                List<SysUser> sysUsers = sysUserService.listByIds(approveUserIds);
-//                sysUserList = new Gson().fromJson(JacksonUtil.parseJson(sysUsers), new TypeToken<List<ApproveUserResult>>() {
-//                }.getType());
-//                List<String> userIdList = approveUserIds.stream().map(x -> String.valueOf(x)).collect(Collectors.toList());
-//                delegateTask.addCandidateUsers(userIdList);
-//                tfFlowLog.setPendApproveId(String.join(", ", userIdList));
-//            } else {
-//                SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-//                if (Objects.isNull(sysUser.getOrgId())) {
-//                    throw ExceptionResultEnum.ERROR.exception("审批人机构为空");
-//                }
-//                sysUserList = activitiService.findByPrintApprove(flowId);
-//                if (Objects.nonNull(sysUserList) && sysUserList.size() > 0) {
-//                    List<String> ids = sysUserList.stream().map(s -> String.valueOf(s.getId())).collect(Collectors.toList());
-//                    //添加或签的人员，一人通过即可进入下一环节
-//                    delegateTask.addCandidateUsers(ids);
-//                    tfFlowLog.setPendApproveId(String.join(", ", ids));
-//                }
-//            }
-//        }
-//        tfFlowLogService.updateById(tfFlowLog);
-//
-//        // 发送审核短信
-//        if (tfFlowApprove.getStatus().equals(FlowStatusEnum.AUDITING)
-//                && tfFlowApprove.getSetup().equals(FlowApproveSetupEnum.FOUR_APPROVE.getSetup())) {
-//            basicMessageService.sendNoticeTaskAuditFlow(examTask, sysUserList, MessageEnum.NOTICE_OF_AUDIT_CREATED);
-//        }
-//    }
-//}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/activiti/StartApproveSubListener.java

@@ -1,39 +0,0 @@
-//package com.qmth.distributed.print.business.activiti;
-//
-//import com.qmth.distributed.print.business.entity.ExamTask;
-//import com.qmth.distributed.print.business.service.ExamTaskService;
-//import com.qmth.distributed.print.business.service.TExamTaskFlowService;
-//import com.qmth.teachcloud.common.contant.SpringContextHolder;
-//import com.qmth.teachcloud.common.contant.SystemConstant;
-//import org.activiti.engine.delegate.DelegateExecution;
-//import org.activiti.engine.delegate.ExecutionListener;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//import org.springframework.transaction.annotation.Transactional;
-//
-//import java.util.HashMap;
-//import java.util.Map;
-//
-///**
-// * @Description: 子流程启动监听
-// * @Param:
-// * @return:
-// * @Author: wangliang
-// * @Date: 2021/11/19
-// */
-//public class StartApproveSubListener implements ExecutionListener {
-//    private final static Logger log = LoggerFactory.getLogger(StartApproveSubListener.class);
-//
-//    @Override
-//    @Transactional
-//    public void notify(DelegateExecution delegateExecution) {
-//        ExamTaskService examTaskService = SpringContextHolder.getBean(ExamTaskService.class);
-//        TExamTaskFlowService tExamTaskFlowService = SpringContextHolder.getBean(TExamTaskFlowService.class);
-//        ExamTask examTask = examTaskService.findByFlowId(SystemConstant.convertIdToLong(delegateExecution.getRootProcessInstanceId()));
-//        Map<String, Object> texamTaskFlowMap = new HashMap<>();
-//        texamTaskFlowMap.computeIfAbsent(SystemConstant.SCHOOL_ID, v -> examTask.getSchoolId());
-//        texamTaskFlowMap.computeIfAbsent(SystemConstant.EXAM_TASK_ID, v -> examTask.getId());
-//        texamTaskFlowMap.computeIfAbsent(SystemConstant.FLOW_ID, v -> SystemConstant.convertIdToLong(delegateExecution.getProcessInstanceId()));
-//        tExamTaskFlowService.saveOrUpdate(texamTaskFlowMap);
-//    }
-//}

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

@@ -1,170 +0,0 @@
-//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.distributed.print.business.entity.TFFlowApproveLog;
-//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: 流程审批列表result
-// * @Param:
-// * @return:
-// * @Author: wangliang
-// * @Date: 2021/8/5
-// */
-//@JsonInclude(JsonInclude.Include.NON_NULL)
-//public class FlowApproveResult extends TFFlowApproveLog implements Serializable {
-//
-//    @ApiModelProperty(value = "发起人名称")
-//    private String startName;
-//
-//    @ApiModelProperty(value = "一级审核人名称")
-//    private String primaryApproveName;
-//
-//    @ApiModelProperty(value = "二级审核人名称")
-//    private String secondApproveName;
-//
-//    @ApiModelProperty(value = "三级审核人名称")
-//    private String threeApproveName;
-//
-//    @ApiModelProperty(value = "四级审核人名称")
-//    private String fourApproveName;
-//
-//    @ApiModelProperty(value = "流程状态")
-//    private FlowStatusEnum status;
-//
-//    @ApiModelProperty(value = "流程状态")
-//    private String statusStr;
-//
-//    @ApiModelProperty(value = "当前节点")
-//    private int setup;
-//
-//    @ApiModelProperty(value = "当前节点")
-//    private String setupStr;
-//
-//    @ApiModelProperty(value = "当前处理人")
-//    private String currentApproveUserName;
-//
-//    @ApiModelProperty(value = "科目代码")
-//    private String courseCode;
-//
-//    @ApiModelProperty(value = "科目名称")
-//    private String courseName;
-//
-//    @ApiModelProperty(value = "试卷编号")
-//    private String paperNumber;
-//
-//    public String getThreeApproveName() {
-//        return threeApproveName;
-//    }
-//
-//    public void setThreeApproveName(String threeApproveName) {
-//        this.threeApproveName = threeApproveName;
-//    }
-//
-//    public String getFourApproveName() {
-//        return fourApproveName;
-//    }
-//
-//    public void setFourApproveName(String fourApproveName) {
-//        this.fourApproveName = fourApproveName;
-//    }
-//
-//    public FlowStatusEnum getStatus() {
-//        return status;
-//    }
-//
-//    public void setStatus(FlowStatusEnum status) {
-//        this.status = status;
-//    }
-//
-//    public String getStartName() {
-//        return startName;
-//    }
-//
-//    public void setStartName(String startName) {
-//        this.startName = startName;
-//    }
-//
-//    public String getPrimaryApproveName() {
-//        return primaryApproveName;
-//    }
-//
-//    public void setPrimaryApproveName(String primaryApproveName) {
-//        this.primaryApproveName = primaryApproveName;
-//    }
-//
-//    public String getSecondApproveName() {
-//        return secondApproveName;
-//    }
-//
-//    public void setSecondApproveName(String secondApproveName) {
-//        this.secondApproveName = secondApproveName;
-//    }
-//
-//    public String getStatusStr() {
-//        if (Objects.nonNull(status)) {
-//            return status.getTitle();
-//        } else {
-//            return statusStr;
-//        }
-//    }
-//
-//    public void setStatusStr(String statusStr) {
-//        this.statusStr = statusStr;
-//    }
-//
-//    public int getSetup() {
-//        return setup;
-//    }
-//
-//    public void setSetup(int setup) {
-//        this.setup = setup;
-//    }
-//
-//    public String getSetupStr() {
-//        return setupStr;
-//    }
-//
-//    public void setSetupStr(String setupStr) {
-//        this.setupStr = setupStr;
-//    }
-//
-//    public String getCurrentApproveUserName() {
-//        return currentApproveUserName;
-//    }
-//
-//    public void setCurrentApproveUserName(String currentApproveUserName) {
-//        this.currentApproveUserName = currentApproveUserName;
-//    }
-//
-//    public String getCourseCode() {
-//        return courseCode;
-//    }
-//
-//    public void setCourseCode(String courseCode) {
-//        this.courseCode = courseCode;
-//    }
-//
-//    public String getCourseName() {
-//        return courseName;
-//    }
-//
-//    public void setCourseName(String courseName) {
-//        this.courseName = courseName;
-//    }
-//
-//    public String getPaperNumber() {
-//        return paperNumber;
-//    }
-//
-//    public void setPaperNumber(String paperNumber) {
-//        this.paperNumber = paperNumber;
-//    }
-//}

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

@@ -2,12 +2,9 @@ package com.qmth.distributed.print.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.qmth.distributed.print.business.bean.dto.approvalForm.ApprovalInfo;
-import com.qmth.distributed.print.business.bean.dto.ReviewLogDto;
 import com.qmth.distributed.print.business.entity.ExamTaskReviewLog;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-
 /**
  * <p>
  * 命题任务审核日志表 Mapper 接口
@@ -18,7 +15,7 @@ import java.util.List;
  */
 public interface ExamTaskReviewLogMapper extends BaseMapper<ExamTaskReviewLog> {
 
-    List<ReviewLogDto> list(@Param("flowId") Long flowId);
+//    List<ReviewLogDto> list(@Param("flowId") Long flowId);
 
     ApprovalInfo findOnePassBySetUp(@Param("flowId") Long flowId, @Param("setup") int setup);
 }

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

@@ -1,24 +0,0 @@
-//package com.qmth.distributed.print.business.mapper;
-//
-//import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-//import com.qmth.distributed.print.business.entity.TFFlowApproveLog;
-//import org.apache.ibatis.annotations.Param;
-//
-///**
-// * <p>
-// * 流程审批记录 Mapper 接口
-// * </p>
-// *
-// * @author wangliang
-// * @since 2021-08-05
-// */
-//public interface TFFlowApproveLogMapper extends BaseMapper<TFFlowApproveLog> {
-//
-//    /**
-//     * 根据流程id查询流程状态
-//     *
-//     * @param flowId
-//     * @return
-//     */
-//    TFFlowApproveLog findByFlowId(@Param("flowId") Long flowId);
-//}

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

@@ -1,60 +0,0 @@
-//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.FlowApproveResult;
-//import com.qmth.distributed.print.business.entity.TFFlow;
-//import org.apache.ibatis.annotations.Param;
-//
-//import java.util.Map;
-//
-///**
-// * <p>
-// * 流程表 Mapper 接口
-// * </p>
-// *
-// * @author wangliang
-// * @since 2021-08-02
-// */
-//public interface TFFlowMapper extends BaseMapper<TFFlow> {
-//
-//    /**
-//     * 流程列表
-//     *
-//     * @param iPage
-//     * @param name
-//     * @param schoolId
-//     * @param orgId
-//     * @return
-//     */
-//    IPage<TFFlow> list(IPage<Map> iPage, @Param("name") String name, @Param("schoolId") Long schoolId, @Param("orgId") Long orgId);
-//
-//    /**
-//     * 流程审批记录列表
-//     *
-//     * @param iPage
-//     * @param startName
-//     * @param schoolId
-//     * @param orgId
-//     * @param flowId
-//     * @return
-//     */
-//    IPage<FlowApproveResult> flowApproveList(IPage<Map> iPage, @Param("status") String status, @Param("startName") String startName, @Param("teachingRoomId") Long teachingRoomId, @Param("createStartTime") Long createStartTime, @Param("createEndTime") Long createEndTime, @Param("schoolId") Long schoolId, @Param("orgId") Long orgId, @Param("flowId") Long flowId);
-//
-//    /**
-//     * 流程审批记录找人
-//     *
-//     * @param schoolId
-//     * @param flowId
-//     * @return
-//     */
-//    FlowApproveResult flowApproveUserList(@Param("schoolId") Long schoolId, @Param("flowId") Long flowId);
-//
-//    /**
-//     * 根据key查找id
-//     *
-//     * @param flowKey
-//     * @return
-//     */
-//    public String findActIdByFlowKey(@Param("flowKey") String flowKey);
-//}

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

@@ -1,10 +1,10 @@
 package com.qmth.distributed.print.business.service;
 
 import com.qmth.distributed.print.business.bean.flow.CustomFlowSaveDto;
-import com.qmth.distributed.print.business.bean.flow.CustomFlowVarDto;
+import com.qmth.distributed.print.business.bean.result.FlowTaskResult;
-import com.qmth.distributed.print.business.bean.result.*;
+import com.qmth.distributed.print.business.bean.result.FlowViewResult;
+import com.qmth.distributed.print.business.bean.result.TaskInfoResult;
 import com.qmth.distributed.print.business.enums.TFCustomTypeEnum;
-import com.qmth.teachcloud.common.bean.params.ApproveUserResult;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -22,35 +22,6 @@ import java.util.Map;
  */
 public interface ActivitiService {
 
-    /**
-     * 创建流程
-     *
-     * @param processFileName
-     */
-    void createDeployment(String processFileName);
-
-    /**
-     * 上传流程文件
-     *
-     * @param file
-     */
-    void uploadDeployment(MultipartFile file) throws IOException;
-
-    /**
-     * 上传流程文件
-     *
-     * @param file
-     */
-    void uploadDeployment(File file) throws IOException;
-
-    /**
-     * 启动流程
-     *
-     * @param processKey
-     * @param map
-     */
-    public ProcessInstance startActivity(String processKey, Map<String, Object> map);
-
     /**
      * 启动流程
      *
@@ -80,23 +51,6 @@ public interface ActivitiService {
      */
     public List<FlowTaskResult> getTaskAll(String flowId);
 
-    /**
-     * 流程删除
-     *
-     * @param id
-     * @return
-     */
-    public Boolean flowDelete(Long id);
-
-    /**
-     * 获取所有流程节点待审批人
-     *
-     * @param courseCode
-     * @param taskId
-     * @return
-     */
-    public FlowTaskApprovePeopleAllResult taskApproverPeopleAll(String courseCode, String taskId);
-
     /**
      * 流程节点转他人审批
      *
@@ -106,40 +60,6 @@ public interface ActivitiService {
      */
     public boolean taskApproverExchange(String userId, String taskId);
 
-    /**
-     * 获取转他人审批人
-     *
-     * @param taskId
-     * @param realName
-     * @return
-     */
-    public FlowTaskApprovePeopleAllResult taskApproverExchangePeople(String taskId, String realName);
-
-    /**
-     * 获取下级节点审批人
-     *
-     * @param courseCode
-     * @param taskId
-     * @return
-     */
-    public FlowTaskApprovePeopleAllResult taskApproverNextPeople(String courseCode, String taskId);
-
-    /**
-     * 获取印刷员审批人
-     *
-     * @param flowId
-     * @return
-     */
-    public List<ApproveUserResult> findByPrintApprove(Long flowId);
-
-    /**
-     * 获取流程提交记录
-     *
-     * @param examTaskId
-     * @return
-     */
-    public List<FlowTaskSubmitPeopleAllResult> taskApproverSubmitList(String examTaskId);
-
     /**
      * 动态创建流程图
      *

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

@@ -1,12 +1,8 @@
 package com.qmth.distributed.print.business.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.bean.dto.approvalForm.ApprovalInfo;
-import com.qmth.distributed.print.business.bean.dto.ReviewLogDto;
 import com.qmth.distributed.print.business.entity.ExamTaskReviewLog;
 
-import java.util.List;
-
 /**
  * <p>
  * 命题任务审核日志表 服务类
@@ -17,7 +13,7 @@ import java.util.List;
  */
 public interface ExamTaskReviewLogService extends IService<ExamTaskReviewLog> {
 
-    List<ReviewLogDto> list(Long flowId);
+//    List<ReviewLogDto> list(Long flowId);
 
-    ApprovalInfo findOnePassBySetUp(Long flowId, int setup);
+//    ApprovalInfo findOnePassBySetUp(Long flowId, int setup);
 }

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

@@ -1,24 +0,0 @@
-//package com.qmth.distributed.print.business.service;
-//
-//import com.baomidou.mybatisplus.extension.service.IService;
-//import com.qmth.distributed.print.business.entity.TFFlowApprove;
-//import com.qmth.distributed.print.business.entity.TFFlowApproveLog;
-//
-///**
-// * <p>
-// * 流程审批记录 服务类
-// * </p>
-// *
-// * @author wangliang
-// * @since 2021-08-05
-// */
-//public interface TFFlowApproveLogService extends IService<TFFlowApproveLog> {
-//
-//    /**
-//     * 根据流程id查询流程状态
-//     *
-//     * @param flowId
-//     * @return
-//     */
-//    TFFlowApproveLog findByFlowId(Long flowId);
-//}

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

@@ -1,67 +0,0 @@
-//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.FlowApproveResult;
-//import com.qmth.distributed.print.business.entity.TFFlow;
-//
-//import java.util.Map;
-//
-///**
-// * <p>
-// * 流程表 服务类
-// * </p>
-// *
-// * @author wangliang
-// * @since 2021-08-02
-// */
-//public interface TFFlowService extends IService<TFFlow> {
-//
-//    /**
-//     * 流程列表
-//     *
-//     * @param iPage
-//     * @param name
-//     * @param schoolId
-//     * @param orgId
-//     * @return
-//     */
-//    public IPage<TFFlow> list(IPage<Map> iPage, String name, Long schoolId, Long orgId);
-//
-//    /**
-//     * 流程审批记录列表
-//     *
-//     * @param iPage
-//     * @param startName
-//     * @param schoolId
-//     * @param orgId
-//     * @param flowId
-//     * @return
-//     */
-//    public IPage<FlowApproveResult> flowApproveList(IPage<Map> iPage, String status, String startName, Long teachingRoomId, Long createStartTime, Long createEndTime, Long schoolId, Long orgId, Long flowId);
-//
-//    /**
-//     * 流程审批记录找人
-//     *
-//     * @param schoolId
-//     * @param flowId
-//     * @return
-//     */
-//    public FlowApproveResult flowApproveUserList(Long schoolId, Long flowId);
-//
-//    /**
-//     * 根据key查找流程
-//     *
-//     * @param flowKey
-//     * @return
-//     */
-//    public Integer findByFlowKey(String flowKey);
-//
-//    /**
-//     * 根据key查找id
-//     *
-//     * @param flowKey
-//     * @return
-//     */
-//    public String findActIdByFlowKey(String flowKey);
-//}

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

@@ -1,6 +1,5 @@
 package com.qmth.distributed.print.business.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.qmth.boot.api.exception.ApiException;
@@ -25,7 +24,6 @@ import com.qmth.teachcloud.common.util.ServletUtil;
 import org.activiti.bpmn.BpmnAutoLayout;
 import org.activiti.bpmn.model.Process;
 import org.activiti.bpmn.model.*;
-import org.activiti.engine.HistoryService;
 import org.activiti.engine.RepositoryService;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.TaskService;
@@ -33,7 +31,6 @@ import org.activiti.engine.impl.bpmn.behavior.MultiInstanceActivityBehavior;
 import org.activiti.engine.impl.bpmn.behavior.ParallelMultiInstanceBehavior;
 import org.activiti.engine.impl.bpmn.behavior.SequentialMultiInstanceBehavior;
 import org.activiti.engine.repository.Deployment;
-import org.activiti.engine.repository.DeploymentBuilder;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
 import org.apache.commons.io.FileUtils;
@@ -42,11 +39,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.*;
@@ -79,30 +74,15 @@ public class ActivitiServiceImpl implements ActivitiService {
     @Resource
     TFFlowLogService tfFlowLogService;
 
-    @Resource
-    HistoryService historyService;
-
     @Resource
     ExamTaskService examTaskService;
 
-//    @Resource
-//    TFFlowApproveLogService tfFlowApproveLogService;
-
     @Resource
     RedisUtil redisUtil;
 
-//    @Resource
-//    TFFlowService tfFlowService;
-
     @Resource
     SysUserService sysUserService;
 
-    @Resource
-    ExamDetailCourseService examDetailCourseService;
-
-    @Resource
-    ExamDetailService examDetailService;
-
     @Resource
     TFFlowJoinService tfFlowJoinService;
 
@@ -115,65 +95,6 @@ public class ActivitiServiceImpl implements ActivitiService {
     @Resource
     TFCustomFlowEntityService tfCustomFlowEntityService;
 
-    /**
-     * 注册流程
-     *
-     * @param processFileName
-     */
-    @Override
-    public void createDeployment(String processFileName) {
-        DeploymentBuilder builder = repositoryService.createDeployment();
-        builder.addClasspathResource(SystemConstant.PROCESSES + File.separator + processFileName);
-        builder.deploy();
-    }
-
-    /**
-     * 上传流程文件
-     *
-     * @param file
-     */
-    @Override
-    public void uploadDeployment(MultipartFile file) throws IOException {
-        DeploymentBuilder builder = repositoryService.createDeployment();
-        builder.addInputStream(file.getOriginalFilename(), file.getInputStream());
-        builder.deploy();
-    }
-
-    /**
-     * 上传流程文件
-     *
-     * @param file
-     */
-    @Override
-    public void uploadDeployment(File file) throws IOException {
-        DeploymentBuilder builder = repositoryService.createDeployment();
-        builder.addInputStream(file.getName(), new FileInputStream(file));
-        builder.deploy();
-    }
-
-    /**
-     * 根据流程key开启一个流程
-     *
-     * @param processKey
-     * @param map
-     */
-    @Override
-    @Transactional
-    public ProcessInstance startActivity(String processKey, Map<String, Object> map) {
-        ProcessInstance processInstance = null;
-        if (Objects.nonNull(map) && map.size() > 0) {
-            processInstance = runtimeService.startProcessInstanceByKey(processKey, map);
-        } else {
-            processInstance = runtimeService.startProcessInstanceByKey(processKey);
-        }
-        log.info("流程id:{},processInstanceId:{},processDefinitionId:{},processDefinitionKey:{}", processInstance.getId(), processInstance.getProcessInstanceId(), processInstance.getProcessDefinitionId(), processInstance.getProcessDefinitionKey());
-        ProcessInstance finalProcessInstance = processInstance;
-        map.computeIfAbsent(SystemConstant.FLOW_ID, v -> finalProcessInstance.getId());
-        map.computeIfAbsent(SystemConstant.FLOW_STATUS, v -> FlowStatusEnum.START);
-        this.flowApproveStart(map);
-        return processInstance;
-    }
-
     /**
      * 启动流程
      *
@@ -318,20 +239,6 @@ public class ActivitiServiceImpl implements ActivitiService {
         tfFlowApproveService.save(new TFFlowApprove(sysUser.getSchoolId(), sysUser.getOrgId(), SystemConstant.convertIdToLong(flowId), sysUser.getId(), flowStatusEnum, sysUser.getId()));
 
         Long objectId = (Long) map.get(SystemConstant.OBJECT_ID);
-//        //TODO 测试用
-//        if (flowType == TFCustomTypeEnum.ELECTRON_FLOW) {//如果是电子交卷审核，就查询命题任务
-//            ExamTask examTask = examTaskService.getById(objectId);
-//            examTask.setFlowId(SystemConstant.convertIdToLong(flowId));
-//            examTaskService.updateById(examTask);
-//        }
-//
-//        String id = (String) map.get(SystemConstant.FLOW_ENTITY_ID);
-//        TFFlowJoin tfFlowJoin = tfFlowJoinService.findByFlowLevel(objectId);
-//        tfFlowJoin.setFlowEntityId(SystemConstant.convertIdToLong(id));
-//        tfFlowJoin.setFlowId(SystemConstant.convertIdToLong(flowId));
-//        tfFlowJoin.setObjectTable(flowType.getTable());
-//        tfFlowJoinService.updateById(tfFlowJoin);
-
         tfFlowLogService.save(new TFFlowLog(sysUser.getSchoolId(), sysUser.getOrgId(), SystemConstant.convertIdToLong(flowId), objectId, sysUser.getId(), sysUser.getId(), "提交流程", approveId, FlowApproveOperationEnum.SUBMIT, flowType.getTable()));
     }
 
@@ -481,7 +388,6 @@ public class ActivitiServiceImpl implements ActivitiService {
                     examTask,
                     objectMap);
             //当前实例的执行到哪个节点
-//            int i = 1 / 0;
             taskService.complete(String.valueOf(flowTaskId), map);
             return objectMap;
         } catch (Exception e) {
@@ -798,252 +704,6 @@ public class ActivitiServiceImpl implements ActivitiService {
         return flowTaskResultList;
     }
 
-    /**
-     * 流程删除
-     *
-     * @param id
-     * @return
-     */
-    @Override
-    public Boolean flowDelete(Long id) {
-//        TFFlow tfFlow = tfFlowService.getById(id);
-//        List<ProcessInstance> processInstanceList = runtimeService.createProcessInstanceQuery().processDefinitionId(tfFlow.getActFlowId()).processDefinitionKey(tfFlow.getFlowKey()).list();
-//        if (Objects.nonNull(processInstanceList) && processInstanceList.size() > 0) {
-//            throw ExceptionResultEnum.ERROR.exception("有在途的流程，无法删除！");
-//        } else {
-//            UpdateWrapper<TFFlow> tfFlowUpdateWrapper = new UpdateWrapper<>();
-//            tfFlowUpdateWrapper.lambda().eq(TFFlow::getId, id)
-//                    .set(TFFlow::getEnable, false);
-//            tfFlowService.update(tfFlowUpdateWrapper);
-//        }
-        return true;
-    }
-
-    /**
-     * 获取所有流程节点待审批人
-     *
-     * @param courseCode
-     * @param taskId
-     * @return
-     */
-    @Override
-    public FlowTaskApprovePeopleAllResult taskApproverPeopleAll(String courseCode, String taskId) {
-        FlowTaskApprovePeopleAllResult flowTaskApprovePeopleAllResult = null;
-//        List<FlowTaskApprovePeopleResult> flowTaskApprovePeopleResultList = null;
-//        if (Objects.nonNull(taskId) && !Objects.equals(taskId, "")) {//说明从已审核的节点开始捞人
-//            Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
-//            Optional.ofNullable(task).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("流程任务为空或该流程已被他人审核，请刷新再试！"));
-//            flowTaskApprovePeopleAllResult = new FlowTaskApprovePeopleAllResult(SystemConstant.convertIdToLong(task.getProcessInstanceId()));
-//            flowTaskApprovePeopleResultList = new LinkedList();
-//            //获取当前流程节点
-//            TFFlowApprove tfFlowApprove = tfFlowApproveService.findByFlowId(flowTaskApprovePeopleAllResult.getFlowId(), Long.parseLong((String) ServletUtil.getRequestHeaderSchoolId()));
-//            Optional.ofNullable(tfFlowApprove).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未找到流程状态记录"));
-//            if (tfFlowApprove.getSetup() <= 0) {
-//                throw ExceptionResultEnum.ERROR.exception("流程已结束或已终止");
-//            }
-//            String processDefinitionId = historyService.createHistoricProcessInstanceQuery().processInstanceId(task.getProcessInstanceId()).singleResult().getProcessDefinitionId();
-//            ProcessDefinitionEntity processDefinitionEntity = (ProcessDefinitionEntity) ((RepositoryServiceImpl) repositoryService).getDeployedProcessDefinition(processDefinitionId);
-//
-//            ExamTask examTask = examTaskService.findByFlowId(flowTaskApprovePeopleAllResult.getFlowId());
-//
-//            FlowApproveResult flowApproveResult = tfFlowService.flowApproveUserList(SystemConstant.getHeadOrUserSchoolId(), flowTaskApprovePeopleAllResult.getFlowId());
-//            if (tfFlowApprove.getSetup() != FlowApproveSetupEnum.SUBMIT.getSetup()) {
-//                Optional.ofNullable(flowApproveResult).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未找到流程审批记录"));
-//            }
-//            List<FlowTaskResult> taskTaskAll = getTaskAll(task.getProcessInstanceId());
-//            switch (tfFlowApprove.getSetup()) {
-//                case -1:
-//                    if (Objects.nonNull(flowApproveResult.getStartId())) {
-//                        //获取命题已审
-//                        List<ApproveUserResult> approveUserMtResult = sysUserService.findById(flowApproveResult.getStartId());
-//                        flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.SUBMIT.getSetup(), true, approveUserMtResult));
-//                    }
-//                    if (Objects.nonNull(flowApproveResult.getPrimaryApproveId())) {
-//                        //获取主任已审
-//                        List<ApproveUserResult> approveUserDirectorList = sysUserService.findById(flowApproveResult.getPrimaryApproveId());
-//                        flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.PRIMARY_APPROVE.getSetup(), true, approveUserDirectorList));
-//                    }
-//                    if (Objects.nonNull(flowApproveResult.getSecondApproveId())) {
-//                        //获取院长已审
-//                        List<ApproveUserResult> approveUserPresidentList = sysUserService.findById(flowApproveResult.getSecondApproveId());
-//                        flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.SECOND_APPROVE.getSetup(), true, approveUserPresidentList));
-//                    }
-//                    if (Objects.nonNull(taskTaskAll) && taskTaskAll.size() > 3) {
-//                        if (Objects.nonNull(flowApproveResult.getThreeApproveId())) {
-//                            //获取命题已审
-//                            List<ApproveUserResult> approveUserTeacherResult = sysUserService.findById(flowApproveResult.getThreeApproveId());
-//                            flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.THREE_APPROVE.getSetup(), true, approveUserTeacherResult));
-//                        }
-//                        if (Objects.nonNull(flowApproveResult.getFourApproveId())) {
-//                            //获取印刷员已审
-//                            List<ApproveUserResult> approveUserPrintResult = sysUserService.findById(flowApproveResult.getFourApproveId());
-//                            flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.FOUR_APPROVE.getSetup(), true, approveUserPrintResult));
-//                        }
-//                    }
-//                    break;
-//                case 0:
-//                    //广东医科大学流程
-//                    if (Objects.nonNull(processDefinitionEntity) && (processDefinitionEntity.getKey().contains(SystemConstant.GDYKDX_FLOW_KEY)
-//                            || processDefinitionEntity.getKey().contains(SystemConstant.GDYKDX_SUB_FLOW_KEY))) {
-//                        //获取命题已审
-//                        List<ApproveUserResult> approveUserMtResult = sysUserService.findById(flowApproveResult.getStartId());
-//                        flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.SUBMIT.getSetup(), true, approveUserMtResult));
-//                        //获取主任已审
-//                        List<ApproveUserResult> approveUserDirectorList = sysUserService.findById(flowApproveResult.getPrimaryApproveId());
-//                        flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.PRIMARY_APPROVE.getSetup(), true, approveUserDirectorList));
-//                        //获取院长已审
-//                        List<ApproveUserResult> approveUserPresidentList = sysUserService.findById(flowApproveResult.getSecondApproveId());
-//                        flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.SECOND_APPROVE.getSetup(), true, approveUserPresidentList));
-//
-//                        if (Objects.nonNull(taskTaskAll) && taskTaskAll.size() > 3) {
-//                            if (Objects.nonNull(flowApproveResult.getThreeApproveId())) {
-//                                //获取命题已审
-//                                List<ApproveUserResult> approveUserTeacherResult = sysUserService.findById(flowApproveResult.getThreeApproveId());
-//                                flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.THREE_APPROVE.getSetup(), true, approveUserTeacherResult));
-//                            }
-//                            if (Objects.nonNull(flowApproveResult.getFourApproveId())) {
-//                                //获取印刷员已审
-//                                List<ApproveUserResult> approveUserPrintResult = sysUserService.findById(flowApproveResult.getFourApproveId());
-//                                flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.FOUR_APPROVE.getSetup(), true, approveUserPrintResult));
-//                            }
-//                        }
-//                    }//江西中医药大学
-//                    else if (Objects.nonNull(processDefinitionEntity) && processDefinitionEntity.getKey().contains(SystemConstant.JXZYY_FLOW_KEY)) {
-//                        //获取命题已审
-//                        List<ApproveUserResult> approveUserMtResult = sysUserService.findById(flowApproveResult.getStartId());
-//                        flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.SUBMIT.getSetup(), true, approveUserMtResult));
-//                        //获取主任已审
-//                        List<ApproveUserResult> approveUserDirectorList = sysUserService.findById(flowApproveResult.getPrimaryApproveId());
-//                        flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.PRIMARY_APPROVE.getSetup(), true, approveUserDirectorList));
-//                    } else {
-//                        throw ExceptionResultEnum.ERROR.exception("未配置流程学校code");
-//                    }
-//                    break;
-//                case 1:
-//                    if (tfFlowApprove.getModel() == FlowModelEnum.SYSTEM) {
-//                        flowTaskApprovePeopleResultList = getApproveUserAll(examTask.getCourseCode(), flowTaskApprovePeopleResultList, Objects.nonNull(processDefinitionEntity) ? processDefinitionEntity.getKey() : null, task.getProcessInstanceId(), taskTaskAll);
-//                    } else {
-//                        //广东医科大学流程
-//                        if (Objects.nonNull(processDefinitionEntity) && (processDefinitionEntity.getKey().contains(SystemConstant.GDYKDX_FLOW_KEY)
-//                                || processDefinitionEntity.getKey().contains(SystemConstant.GDYKDX_SUB_FLOW_KEY))) {
-//                            flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.PRIMARY_APPROVE.getSetup(), false, new ArrayList<>()));
-//                            flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.SECOND_APPROVE.getSetup(), false, new ArrayList<>()));
-//                            if (Objects.nonNull(taskTaskAll) && taskTaskAll.size() > 3) {
-//                                flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.THREE_APPROVE.getSetup(), false, new ArrayList<>()));
-//                                flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.FOUR_APPROVE.getSetup(), false, new ArrayList<>()));
-//                            }
-//                        }//江西中医药大学
-//                        else if (Objects.nonNull(processDefinitionEntity) && processDefinitionEntity.getKey().contains(SystemConstant.JXZYY_FLOW_KEY)) {
-//                            flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.PRIMARY_APPROVE.getSetup(), false, new ArrayList<>()));
-//                        } else {
-//                            throw ExceptionResultEnum.ERROR.exception("未配置流程学校code");
-//                        }
-//                    }
-//                    break;
-//                case 2:
-//                    //广东医科大学流程
-//                    if (Objects.nonNull(processDefinitionEntity) && (processDefinitionEntity.getKey().contains(SystemConstant.GDYKDX_FLOW_KEY)
-//                            || processDefinitionEntity.getKey().contains(SystemConstant.GDYKDX_SUB_FLOW_KEY))) {
-//                        //获取命题已审
-//                        List<ApproveUserResult> approveUserMtResult = sysUserService.findById(flowApproveResult.getStartId());
-//                        flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.SUBMIT.getSetup(), true, approveUserMtResult));
-//
-//                        if (tfFlowApprove.getModel() == FlowModelEnum.SYSTEM) {
-//                            SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-//                            if (Objects.nonNull(sysUser.getOrgId())) {
-//                                //获取院长审批人
-//                                List<ApproveUserResult> sysUserPresidentList = sysUserService.findByPresidentApprove(new ArrayList(Arrays.asList(sysUser.getOrgId())), null);
-//                                flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.SECOND_APPROVE.getSetup(), false, sysUserPresidentList));
-//                            }
-//                            if (Objects.nonNull(taskTaskAll) && taskTaskAll.size() > 3) {
-//                                //获取命题审批人
-//                                flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.THREE_APPROVE.getSetup(), false, approveUserMtResult));
-//                                //获取印刷员审批人
-//                                List<ApproveUserResult> sysUserPrintList = this.findByPrintApprove(SystemConstant.convertIdToLong(task.getProcessInstanceId()));
-//                                flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.FOUR_APPROVE.getSetup(), false, sysUserPrintList));
-//                            }
-//                        } else {
-//                            flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.SECOND_APPROVE.getSetup(), false, new ArrayList<>()));
-//                            if (Objects.nonNull(taskTaskAll) && taskTaskAll.size() > 3) {
-//                                flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.THREE_APPROVE.getSetup(), false, new ArrayList<>()));
-//                                flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.FOUR_APPROVE.getSetup(), false, new ArrayList<>()));
-//                            }
-//                        }
-//                    }//江西中医药大学
-//                    else if (Objects.nonNull(processDefinitionEntity) && processDefinitionEntity.getKey().contains(SystemConstant.JXZYY_FLOW_KEY)) {
-//                        //获取命题已审
-//                        List<ApproveUserResult> approveUserMtResult = sysUserService.findById(flowApproveResult.getStartId());
-//                        flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.SUBMIT.getSetup(), true, approveUserMtResult));
-//                    } else {
-//                        throw ExceptionResultEnum.ERROR.exception("未配置流程学校code");
-//                    }
-//                    break;
-//                case 3:
-//                    //获取命题已审
-//                    List<ApproveUserResult> approveUserMtResult = sysUserService.findById(flowApproveResult.getStartId());
-//                    flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.SUBMIT.getSetup(), true, approveUserMtResult));
-//                    //获取主任已审
-//                    List<ApproveUserResult> sysUserDirectorList = sysUserService.findById(flowApproveResult.getPrimaryApproveId());
-//                    flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.PRIMARY_APPROVE.getSetup(), true, sysUserDirectorList));
-//                    if (Objects.nonNull(taskTaskAll) && taskTaskAll.size() > 3) {
-//                        //获取命题审批人
-//                        flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.THREE_APPROVE.getSetup(), false, approveUserMtResult));
-//                        //获取印刷员审批人
-//                        List<ApproveUserResult> sysUserPrintList = this.findByPrintApprove(SystemConstant.convertIdToLong(task.getProcessInstanceId()));
-//                        flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.FOUR_APPROVE.getSetup(), false, sysUserPrintList));
-//                    }
-//                    break;
-//                case 4:
-//                    //获取命题已审
-//                    approveUserMtResult = sysUserService.findById(flowApproveResult.getStartId());
-//                    flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.SUBMIT.getSetup(), true, approveUserMtResult));
-//                    //获取主任已审
-//                    sysUserDirectorList = sysUserService.findById(flowApproveResult.getPrimaryApproveId());
-//                    flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.PRIMARY_APPROVE.getSetup(), true, sysUserDirectorList));
-//                    //获取院长已审
-//                    List<ApproveUserResult> sysUserPresidentList = sysUserService.findById(flowApproveResult.getSecondApproveId());
-//                    flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.SECOND_APPROVE.getSetup(), true, sysUserPresidentList));
-//                    //获取印刷员审批人
-//                    List<ApproveUserResult> sysUserPrintList = this.findByPrintApprove(SystemConstant.convertIdToLong(task.getProcessInstanceId()));
-//                    flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.FOUR_APPROVE.getSetup(), false, sysUserPrintList));
-//                    break;
-//                case 5:
-//                    //获取命题已审
-//                    approveUserMtResult = sysUserService.findById(flowApproveResult.getStartId());
-//                    flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.SUBMIT.getSetup(), true, approveUserMtResult));
-//                    //获取主任已审
-//                    sysUserDirectorList = sysUserService.findById(flowApproveResult.getPrimaryApproveId());
-//                    flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.PRIMARY_APPROVE.getSetup(), true, sysUserDirectorList));
-//                    //获取院长已审
-//                    sysUserPresidentList = sysUserService.findById(flowApproveResult.getSecondApproveId());
-//                    flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.SECOND_APPROVE.getSetup(), true, sysUserPresidentList));
-//                    //获取命题审核已审
-//                    List<ApproveUserResult> approveUserTeacherResult = sysUserService.findById(flowApproveResult.getThreeApproveId());
-//                    flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.THREE_APPROVE.getSetup(), true, approveUserTeacherResult));
-//                    break;
-//                default:
-//                    break;
-//            }
-//        } else {//获取整个节点审批人
-//            Map<String, List<String>> flowSchoolCodeMap = SystemConstant.getFlowSchoolCodeMap();
-//            BasicSchool basicSchool = (BasicSchool) ServletUtil.getRequestSchool();
-//            if (flowSchoolCodeMap.get(SystemConstant.GDYKDX_FLOW_KEY).contains(basicSchool.getCode())) {
-//                if (Objects.isNull(courseCode) || Objects.equals(courseCode, "")) {
-//                    throw ExceptionResultEnum.ERROR.exception("课程编码为空");
-//                }
-//                flowTaskApprovePeopleResultList = getApproveUserAll(courseCode, flowTaskApprovePeopleResultList, SystemConstant.GDYKDX_FLOW_KEY, null, null);
-//                flowTaskApprovePeopleAllResult = new FlowTaskApprovePeopleAllResult();
-//            } else if (flowSchoolCodeMap.get(SystemConstant.JXZYY_FLOW_KEY).contains(basicSchool.getCode())) {//江西中医药大学
-//                flowTaskApprovePeopleResultList = getApproveUserAll(courseCode, flowTaskApprovePeopleResultList, SystemConstant.JXZYY_FLOW_KEY, null, null);
-//                flowTaskApprovePeopleAllResult = new FlowTaskApprovePeopleAllResult();
-//            } else {
-//                throw ExceptionResultEnum.ERROR.exception("未配置流程学校code");
-//            }
-//        }
-//        flowTaskApprovePeopleAllResult.setApproveUserList(flowTaskApprovePeopleResultList);
-        return flowTaskApprovePeopleAllResult;
-    }
-
     /**
      * 流程节点转他人审批
      *
@@ -1144,7 +804,6 @@ public class ActivitiServiceImpl implements ActivitiService {
         tfFlowLog.setApproveUserApproveType(customFlowVarDto.getMultipleUserApproveType());
         tfFlowLogService.save(tfFlowLog);
 
-//        int i = 1 / 0;
         taskService.setAssignee(taskId, userId);
         return true;
     }
@@ -1162,638 +821,6 @@ public class ActivitiServiceImpl implements ActivitiService {
         approveIds.add(exchangeUserId);
     }
 
-    /**
-     * 获取转他人审批人
-     *
-     * @param taskId
-     * @param realName
-     * @return
-     */
-    @Override
-    public FlowTaskApprovePeopleAllResult taskApproverExchangePeople(String taskId, String realName) {
-        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
-        Optional.ofNullable(task).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("流程任务为空或该流程已被他人审核，请刷新再试！"));
-        FlowTaskApprovePeopleAllResult flowTaskApprovePeopleAllResult = new FlowTaskApprovePeopleAllResult(SystemConstant.convertIdToLong(task.getProcessInstanceId()));
-//        //获取当前流程节点
-//        TFFlowApprove tfFlowApprove = tfFlowApproveService.findByFlowId(flowTaskApprovePeopleAllResult.getFlowId(), sysUser.getSchoolId());
-//        Optional.ofNullable(tfFlowApprove).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未找到流程状态记录"));
-//        if (tfFlowApprove.getSetup() <= 0) {
-//            throw ExceptionResultEnum.ERROR.exception("流程已结束或已终止");
-//        }
-//        String processDefinitionId = historyService.createHistoricProcessInstanceQuery().processInstanceId(task.getProcessInstanceId()).singleResult().getProcessDefinitionId();
-//        ProcessDefinitionEntity processDefinitionEntity = (ProcessDefinitionEntity) ((RepositoryServiceImpl) repositoryService).getDeployedProcessDefinition(processDefinitionId);
-//
-//        ExamTask examTask = null;
-//        List<FlowTaskApprovePeopleResult> flowTaskApprovePeopleResultList = new ArrayList<>();
-//        switch (tfFlowApprove.getSetup()) {
-//            case 1:
-//                List<ApproveUserResult> approveUserResultList = null;
-//                //广东医科大学流程
-//                if (Objects.nonNull(processDefinitionEntity) && (processDefinitionEntity.getKey().contains(SystemConstant.GDYKDX_FLOW_KEY)
-//                        || processDefinitionEntity.getKey().contains(SystemConstant.GDYKDX_SUB_FLOW_KEY))) {
-//                    //获取命题审批人
-//                    examTask = examTaskService.findByFlowId(flowTaskApprovePeopleAllResult.getFlowId());
-//                    approveUserResultList = sysUserService.findByAssignApprove(examTask.getCourseCode(), realName);
-//                }//江西中医药大学
-//                else if (Objects.nonNull(processDefinitionEntity) && processDefinitionEntity.getKey().contains(SystemConstant.JXZYY_FLOW_KEY)) {
-//                    approveUserResultList = sysUserService.findByJxzyyAssignApprove(realName);
-//                } else {
-//                    throw ExceptionResultEnum.ERROR.exception("未配置流程学校code");
-//                }
-//                flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(approveUserResultList));
-//                break;
-//            case 2:
-//                examTask = examTaskService.findByFlowId(flowTaskApprovePeopleAllResult.getFlowId());
-//                List<ApproveUserResult> sysUserDirectorList = null;
-//                //广东医科大学流程
-//                if (Objects.nonNull(processDefinitionEntity) && (processDefinitionEntity.getKey().contains(SystemConstant.GDYKDX_FLOW_KEY)
-//                        || processDefinitionEntity.getKey().contains(SystemConstant.GDYKDX_SUB_FLOW_KEY))) {
-//                    if (tfFlowApprove.getModel() == FlowModelEnum.SYSTEM) {
-//                        //获取教研室主任审批人
-//                        sysUserDirectorList = sysUserService.findByDirectorApprove(examTask.getCourseCode(), realName);
-//                    } else {
-//                        //获取教研室主任审批人
-//                        List<SysOrg> sysOrgList = sysOrgService.findByConnectByParentId(examTask.getTeachingRoomId(), true, true);
-//                        sysUserDirectorList = sysUserService.findByRootApprove(null, sysOrgList.stream().map(s -> s.getId()).collect(Collectors.toList()), null, FlowApproveNameEnum.DIRECTOR);
-//                    }
-//                }//江西中医药大学
-//                else if (Objects.nonNull(processDefinitionEntity) && processDefinitionEntity.getKey().contains(SystemConstant.JXZYY_FLOW_KEY)) {
-//                    //获取教研室主任审批人
-//                    sysUserDirectorList = sysUserService.findByJxzyyDirectorApprove(realName, FlowApproveNameEnum.DIRECTOR);
-//                } else {
-//                    throw ExceptionResultEnum.ERROR.exception("未配置流程学校code");
-//                }
-//                flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(sysUserDirectorList));
-//                break;
-//            case 3:
-//                List<ApproveUserResult> sysUserPresidentList = null;
-//                if (tfFlowApprove.getModel() == FlowModelEnum.SYSTEM) {
-//                    //获取院长审批人
-//                    if (Objects.nonNull(sysUser.getOrgId())) {
-//                        sysUserPresidentList = sysUserService.findByPresidentApprove(new ArrayList(Arrays.asList(sysUser.getOrgId())), realName);
-//                    }
-//                } else {
-//                    //获取院长审批人
-//                    examTask = examTaskService.findByFlowId(flowTaskApprovePeopleAllResult.getFlowId());
-//                    List<SysOrg> sysOrgList = sysOrgService.findByConnectByParentId(examTask.getTeachingRoomId(), true, true);
-//                    sysUserPresidentList = sysUserService.findByRootApprove(null, sysOrgList.stream().map(s -> s.getId()).collect(Collectors.toList()), null, FlowApproveNameEnum.PRESIDENT);
-//                }
-//                flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(sysUserPresidentList));
-//                break;
-//            case 4:
-//                //获取命题审批人
-//                examTask = examTaskService.findByFlowId(flowTaskApprovePeopleAllResult.getFlowId());
-//                approveUserResultList = sysUserService.findByAssignApprove(examTask.getCourseCode(), realName);
-//                flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(approveUserResultList));
-//                break;
-//            case 5:
-//                //获取印刷员审批人
-//                List<ApproveUserResult> approvePrintUserResultList = this.findByPrintApprove(SystemConstant.convertIdToLong(task.getProcessInstanceId()));
-//                flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(approvePrintUserResultList));
-//                break;
-//            default:
-//                break;
-//        }
-//        flowTaskApprovePeopleAllResult.setApproveUserList(flowTaskApprovePeopleResultList);
-        return flowTaskApprovePeopleAllResult;
-    }
-
-    /**
-     * 获取下级节点审批人
-     *
-     * @param courseCode
-     * @param taskId
-     * @return
-     */
-    @Override
-    public FlowTaskApprovePeopleAllResult taskApproverNextPeople(String courseCode, String taskId) {
-        FlowTaskApprovePeopleAllResult flowTaskApprovePeopleAllResult = null;
-//        List<FlowTaskApprovePeopleResult> flowTaskApprovePeopleResultList = null;
-//        if (Objects.nonNull(taskId) && !Objects.equals(taskId, "")) {//说明从已审核的节点开始捞人
-//            Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
-//            Optional.ofNullable(task).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("流程任务为空或该流程已被他人审核，请刷新再试！"));
-//
-//            flowTaskApprovePeopleAllResult = new FlowTaskApprovePeopleAllResult(SystemConstant.convertIdToLong(task.getProcessInstanceId()));
-//            //获取当前流程节点
-//            TFFlowApprove tfFlowApprove = tfFlowApproveService.findByFlowId(flowTaskApprovePeopleAllResult.getFlowId(), Long.parseLong((String) ServletUtil.getRequestHeaderSchoolId()));
-//            Optional.ofNullable(tfFlowApprove).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未找到流程状态记录"));
-//            if (tfFlowApprove.getSetup() <= 0) {
-//                throw ExceptionResultEnum.ERROR.exception("流程已结束或已终止");
-//            }
-//            List<ApproveUserResult> approveUserResultList = null;
-//            flowTaskApprovePeopleResultList = new LinkedList<>();
-//
-//            String processDefinitionId = historyService.createHistoricProcessInstanceQuery().processInstanceId(task.getProcessInstanceId()).singleResult().getProcessDefinitionId();
-//            ProcessDefinitionEntity processDefinitionEntity = (ProcessDefinitionEntity) ((RepositoryServiceImpl) repositoryService).getDeployedProcessDefinition(processDefinitionId);
-//
-//            ExamTask examTask = examTaskService.findByFlowId(flowTaskApprovePeopleAllResult.getFlowId());
-//            List<SysOrg> sysOrgList = sysOrgService.findByConnectByParentId(examTask.getTeachingRoomId(), true, true);
-//            switch (tfFlowApprove.getSetup()) {
-//                case 1:
-//                    //广东医科大学流程
-//                    if (Objects.nonNull(processDefinitionEntity) && (processDefinitionEntity.getKey().contains(SystemConstant.GDYKDX_FLOW_KEY)
-//                            || processDefinitionEntity.getKey().contains(SystemConstant.GDYKDX_SUB_FLOW_KEY))) {
-//                        //获取教研室主任审批人
-//                        approveUserResultList = sysUserService.findByRootApprove(null, sysOrgList.stream().map(s -> s.getId()).collect(Collectors.toList()), null, FlowApproveNameEnum.DIRECTOR);
-//                        flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.PRIMARY_APPROVE.getSetup(), false, approveUserResultList));
-//                    }//江西中医药大学
-//                    else if (Objects.nonNull(processDefinitionEntity) && processDefinitionEntity.getKey().contains(SystemConstant.JXZYY_FLOW_KEY)) {
-//                        //获取教研室主任审批人
-//                        approveUserResultList = sysUserService.findByJxzyyDirectorApprove(null, FlowApproveNameEnum.DIRECTOR);
-//                        flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.PRIMARY_APPROVE.getSetup(), false, approveUserResultList));
-//                    } else {
-//                        throw ExceptionResultEnum.ERROR.exception("未配置流程学校code");
-//                    }
-//                    break;
-//                case 2:
-//                    //获取院长审批人
-//                    approveUserResultList = sysUserService.findByRootApprove(null, sysOrgList.stream().map(s -> s.getId()).collect(Collectors.toList()), null, FlowApproveNameEnum.PRESIDENT);
-//                    flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.SECOND_APPROVE.getSetup(), false, approveUserResultList));
-//                    break;
-//                case 3:
-//                    //获取命题审批人
-//                    approveUserResultList = sysUserService.findByAssignApprove(examTask.getCourseCode(), null);
-//                    flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.THREE_APPROVE.getSetup(), false, approveUserResultList));
-//                    break;
-//                case 4:
-//                    //获取印刷员审批人
-//                    approveUserResultList = this.findByPrintApprove(SystemConstant.convertIdToLong(task.getProcessInstanceId()));
-//                    flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.FOUR_APPROVE.getSetup(), false, approveUserResultList));
-//                    break;
-//                default:
-//                    break;
-//            }
-//        } else {//获取整个节点审批人
-//            Map<String, List<String>> flowSchoolCodeMap = SystemConstant.getFlowSchoolCodeMap();
-//            List<ApproveUserResult> approveUserResultList = null;
-//            BasicSchool basicSchool = (BasicSchool) ServletUtil.getRequestSchool();
-//            if (flowSchoolCodeMap.get(SystemConstant.GDYKDX_FLOW_KEY).contains(basicSchool.getCode())) {
-//                if (Objects.isNull(courseCode) || Objects.equals(courseCode, "")) {
-//                    throw ExceptionResultEnum.ERROR.exception("课程编码为空");
-//                }
-//                approveUserResultList = sysUserService.findByRootApprove(courseCode, null, null, FlowApproveNameEnum.DIRECTOR);
-//            } else if (flowSchoolCodeMap.get(SystemConstant.JXZYY_FLOW_KEY).contains(basicSchool.getCode())) {//江西中医药大学
-//                approveUserResultList = sysUserService.findByJxzyyDirectorApprove(null, FlowApproveNameEnum.DIRECTOR);
-//            } else {
-//                throw ExceptionResultEnum.ERROR.exception("未配置流程学校code");
-//            }
-//            flowTaskApprovePeopleResultList = new LinkedList<>();
-//            flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.PRIMARY_APPROVE.getSetup(), false, approveUserResultList));
-//            flowTaskApprovePeopleAllResult = new FlowTaskApprovePeopleAllResult();
-//        }
-//        flowTaskApprovePeopleAllResult.setApproveUserList(flowTaskApprovePeopleResultList);
-        return flowTaskApprovePeopleAllResult;
-    }
-
-    /**
-     * 获取印刷员审批人
-     *
-     * @param flowId
-     * @return
-     */
-    @Override
-    public List<ApproveUserResult> findByPrintApprove(Long flowId) {
-        ExamTask examTask = examTaskService.findByFlowId(flowId);
-        QueryWrapper<ExamDetailCourse> examDetailCourseQueryWrapper = new QueryWrapper<>();
-        examDetailCourseQueryWrapper.lambda().eq(ExamDetailCourse::getSchoolId, examTask.getSchoolId())
-                .eq(ExamDetailCourse::getCourseCode, examTask.getCourseCode())
-                .eq(ExamDetailCourse::getPaperNumber, examTask.getPaperNumber());
-        List<ExamDetailCourse> examDetailCourseList = examDetailCourseService.list(examDetailCourseQueryWrapper);
-
-        List<ApproveUserResult> approveUserResultList = null;
-        if (Objects.nonNull(examDetailCourseList) && examDetailCourseList.size() > 0) {
-            Set<Long> examDetailIdSet = examDetailCourseList.stream().map(s -> s.getExamDetailId()).collect(Collectors.toSet());
-            QueryWrapper<ExamDetail> examDetailQueryWrapper = new QueryWrapper<>();
-            examDetailQueryWrapper.lambda().in(ExamDetail::getId, examDetailIdSet);
-            List<ExamDetail> examDetailList = examDetailService.list(examDetailQueryWrapper);
-            if (Objects.nonNull(examDetailList) && examDetailList.size() > 0) {
-                Set<Long> printHouseIdSet = examDetailList.stream().map(s -> s.getPrintHouseId()).collect(Collectors.toSet());
-                approveUserResultList = sysUserService.findByOrgIds(printHouseIdSet);
-            }
-        }
-        return approveUserResultList;
-    }
-
-    /**
-     * 获取流程提交记录
-     *
-     * @param examTaskId
-     * @return
-     */
-    @Override
-    public List<FlowTaskSubmitPeopleAllResult> taskApproverSubmitList(String examTaskId) {
-        List<FlowTaskSubmitPeopleAllResult> flowTaskSubmitPeopleAllResultList = null;
-        List<TFFlowLogResult> tfFlowLogResultList = tfFlowLogService.findByObjectId(SystemConstant.convertIdToLong(examTaskId));
-        if (Objects.nonNull(tfFlowLogResultList) && tfFlowLogResultList.size() > 0) {
-            flowTaskSubmitPeopleAllResultList = new LinkedList<>();
-            for (TFFlowLogResult t : tfFlowLogResultList) {
-                ApproveUserResult submitUser = new ApproveUserResult(t.getOrgName(), t.getOrgType(), t.getLoginName(), t.getRealName(), t.getSchoolId(), t.getCode(), t.getMobileNumber(), t.getCreateTime(), t.getPaperAttachmentId());
-                FlowTaskSubmitPeopleAllResult flowTaskSubmitPeopleAllResult = new FlowTaskSubmitPeopleAllResult(t.getFlowId(), submitUser);
-
-                if (Objects.nonNull(t.getPendApproveId())) {
-                    List<ApproveUserResult> approveUserList = new LinkedList<>();
-                    String[] pendApproveIds = t.getPendApproveId().split(",");
-                    for (int i = 0; i < pendApproveIds.length; i++) {
-                        approveUserList.addAll(sysUserService.findById(SystemConstant.convertIdToLong(pendApproveIds[i].trim())));
-                    }
-                    flowTaskSubmitPeopleAllResult.setApproveUserList(approveUserList);
-                }
-                flowTaskSubmitPeopleAllResultList.add(flowTaskSubmitPeopleAllResult);
-            }
-        }
-        return flowTaskSubmitPeopleAllResultList;
-    }
-
-    /**
-     * 流程提交校验
-     *
-     * @param task
-     * @param userId
-     */
-    private void flowSubmitVaild(Task task, Long userId) {
-        if (Objects.isNull(task.getAssignee())) {
-            Task taskUser = taskService.createTaskQuery().taskId(task.getId()).taskAssignee(String.valueOf(userId)).singleResult();
-            Optional.ofNullable(taskUser).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("不能提交他人的任务或者该任务已被审核，请刷新再试！"));
-        } else {
-            if (!Objects.equals(task.getAssignee(), String.valueOf(userId))) {
-                throw ExceptionResultEnum.ERROR.exception("不能提交他人的任务或者该任务已被审核，请刷新再试！");
-            }
-        }
-    }
-
-    /**
-     * 流程审批校验
-     *
-     * @param task
-     * @param userId
-     * @param map
-     */
-    private void flowApproveVaild(Task task, Long userId, Map<String, Object> map) {
-        if (Objects.isNull(task.getAssignee())) {
-            Task taskUser = taskService.createTaskQuery().taskId(task.getId()).taskCandidateUser(String.valueOf(userId)).singleResult();
-            Optional.ofNullable(taskUser).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("不能提交他人的任务或者该任务已被审核，请刷新再试！"));
-        } else {
-            if (!Objects.equals(task.getAssignee(), String.valueOf(userId))) {
-                throw ExceptionResultEnum.ERROR.exception("不能提交他人的任务或者该任务已被审核，请刷新再试！");
-            }
-        }
-        Optional.ofNullable(map.get(SystemConstant.APPROVE_OPERATION)).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("流程审核操作不能为空"));
-    }
-
-    /**
-     * 获取所有审批人
-     *
-     * @param courseCode
-     * @param flowTaskApprovePeopleResultList
-     * @param processDefinitionEntity
-     * @param processInstanceId
-     * @param taskTaskAll
-     */
-    private List<FlowTaskApprovePeopleResult> getApproveUserAll(String courseCode
-            , List<FlowTaskApprovePeopleResult> flowTaskApprovePeopleResultList
-            , String processDefinitionEntity
-            , String processInstanceId
-            , List<FlowTaskResult> taskTaskAll) {
-        flowTaskApprovePeopleResultList = Objects.isNull(flowTaskApprovePeopleResultList) ? new LinkedList() : flowTaskApprovePeopleResultList;
-//        //广东医科大学流程
-//        if (Objects.nonNull(processDefinitionEntity) && (processDefinitionEntity.contains(SystemConstant.GDYKDX_FLOW_KEY)
-//                || processDefinitionEntity.contains(SystemConstant.GDYKDX_SUB_FLOW_KEY))) {
-//            //获取教研室主任审批人
-//            List<ApproveUserResult> sysUserDirectorList = sysUserService.findByDirectorApprove(courseCode, null);
-//            flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.PRIMARY_APPROVE.getSetup(), false, sysUserDirectorList));
-//            Set<Long> orgIds = sysUserDirectorList.stream().map(s -> s.getOrgId()).collect(Collectors.toSet());
-//            //获取院长审批人
-//            List<ApproveUserResult> sysUserPresidentList = sysUserService.findByPresidentApprove(new ArrayList<>(orgIds), null);
-//            flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.SECOND_APPROVE.getSetup(), false, sysUserPresidentList));
-//            if (Objects.nonNull(taskTaskAll) && taskTaskAll.size() > 3) {
-//                //获取命题审批人
-//                List<ApproveUserResult> sysUserTeacherList = sysUserService.findByAssignApprove(courseCode, null);
-//                flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.THREE_APPROVE.getSetup(), false, sysUserTeacherList));
-//                if (Objects.nonNull(processInstanceId)) {
-//                    //获取印刷员审批人
-//                    List<ApproveUserResult> sysUserPrintList = this.findByPrintApprove(SystemConstant.convertIdToLong(processInstanceId));
-//                    flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.FOUR_APPROVE.getSetup(), false, sysUserPrintList));
-//                }
-//            }
-//        }//江西中医药大学
-//        else if (Objects.nonNull(processDefinitionEntity) && processDefinitionEntity.contains(SystemConstant.JXZYY_FLOW_KEY)) {
-//            //获取教研室主任审批人
-//            List<ApproveUserResult> sysUserDirectorList = sysUserService.findByJxzyyDirectorApprove(null, FlowApproveNameEnum.DIRECTOR);
-//            flowTaskApprovePeopleResultList.add(new FlowTaskApprovePeopleResult(FlowApproveSetupEnum.PRIMARY_APPROVE.getSetup(), false, sysUserDirectorList));
-//        } else {
-//            throw ExceptionResultEnum.ERROR.exception("未配置流程学校code");
-//        }
-        return flowTaskApprovePeopleResultList;
-    }
-
-//    /**
-//     * 命题提交
-//     *
-//     * @param task
-//     * @param sysUser
-//     * @param tfFlowApprove
-//     * @param tfFlowLog
-//     * @param map
-//     */
-//    private void assignSubmit(Task task,
-//                              SysUser sysUser,
-//                              TFFlowApprove tfFlowApprove,
-//                              TFFlowLog tfFlowLog,
-//                              Map<String, Object> map) {
-//        flowSubmitVaild(task, sysUser.getId());
-//        tfFlowLog.setApproveSetup(FlowApproveSetupEnum.SUBMIT.getSetup());
-//        tfFlowLog.setApproveOperation(FlowApproveOperationEnum.SUBMIT);
-//        tfFlowLog.setPaperAttachmentId((String) map.get(SystemConstant.PAPAER_ATTACHMENT_IDS));
-//        tfFlowApprove.setStatus(FlowStatusEnum.AUDITING);
-//        tfFlowApprove.setSetup(FlowApproveSetupEnum.PRIMARY_APPROVE.getSetup());
-//        map.computeIfAbsent(SystemConstant.APPROVE_DIRECTOR_USER_IDS, v -> map.get(SystemConstant.APPROVE_USER_IDS));
-//    }
-//
-//    /**
-//     * 主任审核
-//     *
-//     * @param task
-//     * @param sysUser
-//     * @param tfFlowApprove
-//     * @param tfFlowApproveLog
-//     * @param tfFlowLog
-//     * @param remark
-//     * @param processDefinitionEntity
-//     * @param map
-//     */
-//    private void directorApprove(Task task,
-//                                 SysUser sysUser,
-//                                 TFFlowApprove tfFlowApprove,
-//                                 TFFlowApproveLog tfFlowApproveLog,
-//                                 TFFlowLog tfFlowLog,
-//                                 String remark,
-//                                 ProcessDefinitionEntity processDefinitionEntity,
-//                                 Map<String, Object> map) {
-//        FlowApprovePassEnum flowApprovePassEnum = (FlowApprovePassEnum) map.get(SystemConstant.APPROVE_CANCEL);
-//        Long approveCancelUserId = (Long) map.get(SystemConstant.APPROVE_CANCEL_USER);
-//        if (Objects.isNull(approveCancelUserId) || approveCancelUserId.longValue() != SystemConstant.APPROVE_CANCEL_USER_ID.longValue()) {
-//            flowApproveVaild(task, sysUser.getId(), map);
-//        }
-//        FlowApprovePassEnum approvePass = (FlowApprovePassEnum) map.get(SystemConstant.APPROVE_OPERATION);
-//        FlowApproveVariableEnum approve = approvePass == FlowApprovePassEnum.PASS ? FlowApproveVariableEnum.PRIMARY_APPROVE : FlowApproveVariableEnum.PRIMARY_REJECT;
-//
-//        tfFlowLog.setApproveSetup(FlowApproveSetupEnum.PRIMARY_APPROVE.getSetup());
-//        tfFlowApproveLog.setPrimaryApproveId(sysUser.getId());
-//        tfFlowApproveLog.setPrimaryApproveRemark(remark);
-//        if (approve == FlowApproveVariableEnum.PRIMARY_REJECT) {//驳回命题
-//            if (Objects.nonNull(flowApprovePassEnum) && flowApprovePassEnum == FlowApprovePassEnum.CANCEL) {
-//                tfFlowLog.setApproveOperation(FlowApproveOperationEnum.CANCEL);
-//                tfFlowApproveLog.setPrimaryApproveOperation(FlowApproveOperationEnum.CANCEL);
-//                tfFlowApprove.setStatus(FlowStatusEnum.CANCEL);
-//                tfFlowLog.setEnable(false);
-//
-////                List<TFFlowLog> tfFlowLogList = tfFlowLogService.findByFlowId(Long.parseLong(task.getProcessInstanceId()), sysUser.getSchoolId());
-//                UpdateWrapper<TFFlowLog> tfFlowLogUpdateWrapper = new UpdateWrapper<>();
-//                tfFlowLogUpdateWrapper.lambda().eq(TFFlowLog::getApproveOperation, FlowApproveOperationEnum.SUBMIT)
-//                        .eq(TFFlowLog::getFlowId, Long.parseLong(task.getProcessInstanceId()))
-////                        .set(TFFlowLog::getPaperAttachmentId, null);
-//                        .set(TFFlowLog::getEnable, false);
-//                tfFlowLogService.update(tfFlowLogUpdateWrapper);
-////                tfFlowLogService.removeByIds(tfFlowLogList.stream().map(s -> s.getId()).collect(Collectors.toList()));
-//            } else {
-//                tfFlowLog.setApproveOperation(FlowApproveOperationEnum.REJECT);
-//                tfFlowApproveLog.setPrimaryApproveOperation(FlowApproveOperationEnum.REJECT);
-//                tfFlowApprove.setStatus(FlowStatusEnum.REJECT);
-//            }
-//            tfFlowApprove.setSetup(FlowApproveSetupEnum.SUBMIT.getSetup());
-//            tfFlowLog.setPendApproveId(String.valueOf(tfFlowApproveLog.getStartId()));
-//        } else if (approve == FlowApproveVariableEnum.PRIMARY_APPROVE) {//提交
-//            tfFlowLog.setApproveOperation(FlowApproveOperationEnum.APPROVE);
-//            tfFlowApproveLog.setPrimaryApproveOperation(FlowApproveOperationEnum.APPROVE);
-//            //广东医科大学流程
-//            if (Objects.nonNull(processDefinitionEntity) && processDefinitionEntity.getKey().contains(SystemConstant.GDYKDX_FLOW_KEY)) {
-//                tfFlowApprove.setStatus(FlowStatusEnum.AUDITING);
-//                tfFlowApprove.setSetup(FlowApproveSetupEnum.SECOND_APPROVE.getSetup());
-//            }
-//            //江西中医药大学
-//            else if (Objects.nonNull(processDefinitionEntity) && processDefinitionEntity.getKey().contains(SystemConstant.JXZYY_FLOW_KEY)) {
-//                tfFlowApprove.setStatus(FlowStatusEnum.FINISH);
-//                tfFlowApprove.setSetup(FlowApproveSetupEnum.FINISH.getSetup());
-//            } else {
-//                throw ExceptionResultEnum.ERROR.exception("未配置流程学校code");
-//            }
-//        } else {
-//            throw ExceptionResultEnum.ERROR.exception("流程变量值错误");
-//        }
-//        map.computeIfAbsent(SystemConstant.APPROVE, v -> approve.getId());
-//        map.computeIfAbsent(SystemConstant.APPROVE_PRESIDENT_USER_IDS, v -> map.get(SystemConstant.APPROVE_USER_IDS));
-//    }
-
-//    /**
-//     * 命题终止
-//     *
-//     * @param tfFlowApproveLog
-//     * @param sysUser
-//     */
-//    private void assignFlowEnd(TFFlowApproveLog tfFlowApproveLog, SysUser sysUser) {
-//        tfFlowApproveLog.setStartId(sysUser.getId());
-//        tfFlowApproveLog.setRemark(FlowApproveSetupEnum.SUBMIT.getTitle() + FlowApproveOperationEnum.END.getTitle());
-//    }
-
-//    /**
-//     * 主任终止
-//     *
-//     * @param tfFlowApproveLog
-//     * @param sysUser
-//     */
-//    private void directorFlowEnd(TFFlowApproveLog tfFlowApproveLog, SysUser sysUser) {
-//        tfFlowApproveLog.setPrimaryApproveId(sysUser.getId());
-//        tfFlowApproveLog.setPrimaryApproveOperation(FlowApproveOperationEnum.END);
-//        tfFlowApproveLog.setPrimaryApproveRemark(FlowApproveOperationEnum.END.getTitle());
-//    }
-
-//    /**
-//     * 院长终止
-//     *
-//     * @param tfFlowApproveLog
-//     * @param sysUser
-//     */
-//    private void presidentFlowEnd(TFFlowApproveLog tfFlowApproveLog, SysUser sysUser) {
-//        tfFlowApproveLog.setSecondApproveId(sysUser.getId());
-//        tfFlowApproveLog.setSecondApproveOperation(FlowApproveOperationEnum.END);
-//        tfFlowApproveLog.setSecondApproveRemark(FlowApproveOperationEnum.END.getTitle());
-//    }
-
-//    /**
-//     * 命题终止
-//     *
-//     * @param tfFlowApproveLog
-//     * @param sysUser
-//     */
-//    private void teacherFlowEnd(TFFlowApproveLog tfFlowApproveLog, SysUser sysUser) {
-//        tfFlowApproveLog.setThreeApproveId(sysUser.getId());
-//        tfFlowApproveLog.setThreeApproveRemark(FlowApproveSetupEnum.THREE_APPROVE.getTitle() + FlowApproveOperationEnum.END.getTitle());
-//        tfFlowApproveLog.setThreeApproveOperation(FlowApproveOperationEnum.APPROVE);
-//    }
-
-//    /**
-//     * 印刷员终止
-//     *
-//     * @param tfFlowApproveLog
-//     * @param sysUser
-//     */
-//    private void printFlowEnd(TFFlowApproveLog tfFlowApproveLog, SysUser sysUser) {
-//        tfFlowApproveLog.setFourApproveId(sysUser.getId());
-//        tfFlowApproveLog.setFourApproveOperation(FlowApproveOperationEnum.END);
-//        tfFlowApproveLog.setFourApproveRemark(FlowApproveOperationEnum.END.getTitle());
-//    }
-
-//    /**
-//     * 院长审核
-//     *
-//     * @param task
-//     * @param sysUser
-//     * @param tfFlowApprove
-//     * @param tfFlowApproveLog
-//     * @param tfFlowLog
-//     * @param remark
-//     * @param map
-//     * @param objectMap
-//     * @param processInstanceId
-//     */
-//    private void presidentApprove(Task task,
-//                                  SysUser sysUser,
-//                                  TFFlowApprove tfFlowApprove,
-//                                  TFFlowApproveLog tfFlowApproveLog,
-//                                  TFFlowLog tfFlowLog,
-//                                  String remark,
-//                                  Map<String, Object> map,
-//                                  Map<String, Object> objectMap,
-//                                  String processInstanceId) {
-//        flowApproveVaild(task, sysUser.getId(), map);
-//        FlowApprovePassEnum approvePass = (FlowApprovePassEnum) map.get(SystemConstant.APPROVE_OPERATION);
-//        FlowApproveVariableEnum approve = null;
-//        tfFlowApproveLog.setSecondApproveId(sysUser.getId());
-//        tfFlowApproveLog.setSecondApproveRemark(remark);
-//        if (approvePass == FlowApprovePassEnum.PASS) {
-//            approve = FlowApproveVariableEnum.SECOND_APPROVE;
-//        } else {
-//            Optional.ofNullable(map.get(SystemConstant.APPROVE_SETUP)).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("流程驳回节点不能为空"));
-//            Integer setup = Integer.parseInt(map.get(SystemConstant.APPROVE_SETUP).toString());
-//            if (setup.intValue() < FlowApproveSetupEnum.SUBMIT.getSetup() || setup.intValue() >= FlowApproveSetupEnum.SECOND_APPROVE.getSetup()) {
-//                throw ExceptionResultEnum.ERROR.exception("流程驳回节点有误");
-//            }
-//            approve = setup.intValue() == 1 ? FlowApproveVariableEnum.SECOND_REJECT_ONE : FlowApproveVariableEnum.SECOND_REJECT_TWO;
-//        }
-//        tfFlowLog.setApproveSetup(FlowApproveSetupEnum.SECOND_APPROVE.getSetup());
-//        if (approve == FlowApproveVariableEnum.SECOND_REJECT_ONE) {//驳回命题
-//            tfFlowLog.setApproveOperation(FlowApproveOperationEnum.REJECT);
-//            tfFlowApproveLog.setSecondApproveOperation(FlowApproveOperationEnum.REJECT);
-//            tfFlowApprove.setStatus(FlowStatusEnum.REJECT);
-//            tfFlowApprove.setSetup(FlowApproveSetupEnum.SUBMIT.getSetup());
-//            tfFlowLog.setPendApproveId(String.valueOf(tfFlowApproveLog.getStartId()));
-//        } else if (approve == FlowApproveVariableEnum.SECOND_REJECT_TWO) {//驳回主任
-//            tfFlowLog.setApproveOperation(FlowApproveOperationEnum.REJECT);
-//            tfFlowApproveLog.setSecondApproveOperation(FlowApproveOperationEnum.REJECT);
-//            tfFlowApprove.setStatus(FlowStatusEnum.REJECT);
-//            tfFlowApprove.setSetup(FlowApproveSetupEnum.PRIMARY_APPROVE.getSetup());
-//        } else if (approve == FlowApproveVariableEnum.SECOND_APPROVE) {//提交
-//            tfFlowLog.setApproveOperation(FlowApproveOperationEnum.APPROVE);
-//            tfFlowApproveLog.setSecondApproveOperation(FlowApproveOperationEnum.APPROVE);
-//            List<FlowTaskResult> taskTaskAll = getTaskAll(processInstanceId);
-//            if (Objects.nonNull(taskTaskAll) && taskTaskAll.size() > 3) {
-//                tfFlowApprove.setStatus(FlowStatusEnum.AUDITING);
-//                tfFlowApprove.setSetup(FlowApproveSetupEnum.THREE_APPROVE.getSetup());
-//                objectMap.computeIfAbsent(SystemConstant.APPROVE_PRESIDENT_SYSTEM, v -> true);
-//                tfFlowLog.setPendApproveId(String.valueOf(tfFlowApproveLog.getStartId()));
-//            } else {
-//                tfFlowApprove.setStatus(FlowStatusEnum.FINISH);
-//                tfFlowApprove.setSetup(FlowApproveSetupEnum.FINISH.getSetup());
-//            }
-//        } else {
-//            throw ExceptionResultEnum.ERROR.exception("流程变量值错误");
-//        }
-//        FlowApproveVariableEnum finalApprove = approve;
-//        map.computeIfAbsent(SystemConstant.APPROVE, v -> finalApprove.getId());
-//        TFFlowApproveLog finalTfFlowApproveLog = tfFlowApproveLog;
-//        map.computeIfAbsent(SystemConstant.APPROVE_ID, v -> finalTfFlowApproveLog.getStartId());
-//    }
-
-//    /**
-//     * 命题老师审核
-//     *
-//     * @param task
-//     * @param sysUser
-//     * @param tfFlowApprove
-//     * @param tfFlowApproveLog
-//     * @param tfFlowLog
-//     * @param remark
-//     * @param map
-//     */
-//    private void teacherApprove(Task task,
-//                                SysUser sysUser,
-//                                TFFlowApprove tfFlowApprove,
-//                                TFFlowApproveLog tfFlowApproveLog,
-//                                TFFlowLog tfFlowLog,
-//                                String remark,
-//                                Map<String, Object> map) {
-//        boolean presidentApprove = Objects.nonNull(map.get(SystemConstant.APPROVE_PRESIDENT_SYSTEM)) ? (boolean) map.get(SystemConstant.APPROVE_PRESIDENT_SYSTEM) : false;
-//        Long userId = null;
-//        if (presidentApprove) {
-//            userId = tfFlowApproveLog.getStartId();
-//        } else {
-//            userId = sysUser.getId();
-//        }
-//        flowSubmitVaild(task, userId);
-//        tfFlowLog.setApproveSetup(FlowApproveSetupEnum.THREE_APPROVE.getSetup());
-//        tfFlowLog.setApproveOperation(FlowApproveOperationEnum.APPROVE);
-//        tfFlowLog.setApproveId(userId);
-//        tfFlowLog.setPaperAttachmentId((String) map.get(SystemConstant.PAPAER_ATTACHMENT_IDS));
-//        tfFlowApprove.setStatus(FlowStatusEnum.AUDITING);
-//        tfFlowApprove.setSetup(FlowApproveSetupEnum.FOUR_APPROVE.getSetup());
-//        tfFlowApproveLog.setThreeApproveId(userId);
-//        tfFlowApproveLog.setThreeApproveRemark(remark);
-//        tfFlowApproveLog.setThreeApproveOperation(FlowApproveOperationEnum.APPROVE);
-//        map.computeIfAbsent(SystemConstant.APPROVE_PRINT_USER_IDS, v -> map.get(SystemConstant.APPROVE_USER_IDS));
-//    }
-
-//    /**
-//     * 印刷员审核
-//     *
-//     * @param task
-//     * @param sysUser
-//     * @param tfFlowApprove
-//     * @param tfFlowApproveLog
-//     * @param tfFlowLog
-//     * @param remark
-//     * @param map
-//     */
-//    private void printApprove(Task task,
-//                              SysUser sysUser,
-//                              TFFlowApprove tfFlowApprove,
-//                              TFFlowApproveLog tfFlowApproveLog,
-//                              TFFlowLog tfFlowLog,
-//                              String remark,
-//                              Map<String, Object> map) {
-//        flowApproveVaild(task, sysUser.getId(), map);
-//        FlowApprovePassEnum approvePass = (FlowApprovePassEnum) map.get(SystemConstant.APPROVE_OPERATION);
-//        FlowApproveVariableEnum approve = approvePass == FlowApprovePassEnum.PASS ? FlowApproveVariableEnum.FOUR_APPROVE : FlowApproveVariableEnum.FOUR_REJECT;
-//        tfFlowLog.setApproveSetup(FlowApproveSetupEnum.FOUR_APPROVE.getSetup());
-//        tfFlowApproveLog.setFourApproveId(sysUser.getId());
-//        tfFlowApproveLog.setFourApproveRemark(remark);
-//        if (approve == FlowApproveVariableEnum.FOUR_REJECT) {//驳回命题
-//            tfFlowLog.setApproveOperation(FlowApproveOperationEnum.REJECT);
-//            tfFlowApproveLog.setFourApproveOperation(FlowApproveOperationEnum.REJECT);
-//            tfFlowApprove.setStatus(FlowStatusEnum.REJECT);
-//            tfFlowApprove.setSetup(FlowApproveSetupEnum.THREE_APPROVE.getSetup());
-//            tfFlowLog.setPendApproveId(String.valueOf(tfFlowApproveLog.getStartId()));
-//        } else if (approve == FlowApproveVariableEnum.FOUR_APPROVE) {//提交
-//            tfFlowLog.setApproveOperation(FlowApproveOperationEnum.APPROVE);
-//            tfFlowApproveLog.setFourApproveOperation(FlowApproveOperationEnum.APPROVE);
-//            tfFlowApprove.setStatus(FlowStatusEnum.FINISH);
-//            tfFlowApprove.setSetup(FlowApproveSetupEnum.FINISH.getSetup());
-//        } else {
-//            throw ExceptionResultEnum.ERROR.exception("流程变量值错误");
-//        }
-//        map.computeIfAbsent(SystemConstant.APPROVE, v -> approve.getId());
-//    }
-
     /**
      * 动态创建流程图
      *

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

@@ -2,14 +2,11 @@ package com.qmth.distributed.print.business.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.distributed.print.business.bean.dto.approvalForm.ApprovalInfo;
-import com.qmth.distributed.print.business.bean.dto.ReviewLogDto;
 import com.qmth.distributed.print.business.entity.ExamTaskReviewLog;
 import com.qmth.distributed.print.business.mapper.ExamTaskReviewLogMapper;
 import com.qmth.distributed.print.business.service.ExamTaskReviewLogService;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
  * <p>
  * 命题任务审核日志表 服务实现类
@@ -21,13 +18,13 @@ import java.util.List;
 @Service
 public class ExamTaskReviewLogServiceImpl extends ServiceImpl<ExamTaskReviewLogMapper, ExamTaskReviewLog> implements ExamTaskReviewLogService {
 
-    @Override
+//    @Override
-    public List<ReviewLogDto> list(Long flowId) {
+//    public List<ReviewLogDto> list(Long flowId) {
-        return this.baseMapper.list(flowId);
+//        return this.baseMapper.list(flowId);
-    }
+//    }
 
-    @Override
+//    @Override
-    public ApprovalInfo findOnePassBySetUp(Long flowId, int setup) {
+//    public ApprovalInfo findOnePassBySetUp(Long flowId, int setup) {
-        return this.baseMapper.findOnePassBySetUp(flowId,setup);
+//        return this.baseMapper.findOnePassBySetUp(flowId,setup);
-    }
+//    }
 }

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

@@ -1839,31 +1839,32 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         final String link = ",";
         List<ApprovalInfo> approvalInfoList = new ArrayList<>();
         if (review) {
-            ApprovalInfo second = examTaskReviewLogService.findOnePassBySetUp(flowId, 2);
+            //TODO 主任和院长审核需修改
-            if (Objects.isNull(second)) {
+//            ApprovalInfo second = examTaskReviewLogService.findOnePassBySetUp(flowId, 2);
-                throw ExceptionResultEnum.ERROR.exception("未找到主任级审核记录");
+//            if (Objects.isNull(second)) {
-            }
+//                throw ExceptionResultEnum.ERROR.exception("未找到主任级审核记录");
-            ApprovalInfo third = examTaskReviewLogService.findOnePassBySetUp(flowId, 3);
+//            }
-            if (Objects.isNull(third)) {
+//            ApprovalInfo third = examTaskReviewLogService.findOnePassBySetUp(flowId, 3);
-                throw ExceptionResultEnum.ERROR.exception("未找到院长级审核记录");
+//            if (Objects.isNull(third)) {
-            }
+//                throw ExceptionResultEnum.ERROR.exception("未找到院长级审核记录");
-            String secondRemark = second.getRemark();
+//            }
-            if (SystemConstant.strNotNull(secondRemark)) {
+//            String secondRemark = second.getRemark();
-                secondRemark = remark + link + secondRemark;
+//            if (SystemConstant.strNotNull(secondRemark)) {
-            } else {
+//                secondRemark = remark + link + secondRemark;
-                secondRemark = remark;
+//            } else {
-            }
+//                secondRemark = remark;
-
+//            }
-            String thirdRemark = third.getRemark();
+//
-            if (SystemConstant.strNotNull(thirdRemark)) {
+//            String thirdRemark = third.getRemark();
-                thirdRemark = remark + link + thirdRemark;
+//            if (SystemConstant.strNotNull(thirdRemark)) {
-            } else {
+//                thirdRemark = remark + link + thirdRemark;
-                thirdRemark = remark;
+//            } else {
-            }
+//                thirdRemark = remark;
-            second.setRemark(secondRemark);
+//            }
-            third.setRemark(thirdRemark);
+//            second.setRemark(secondRemark);
-            approvalInfoList.add(second);
+//            third.setRemark(thirdRemark);
-            approvalInfoList.add(third);
+//            approvalInfoList.add(second);
+//            approvalInfoList.add(third);
         }
 
         // 2.ExamRoomInfo 部分

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

@@ -1,35 +0,0 @@
-//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;
-//
-//import javax.annotation.Resource;
-//
-///**
-// * <p>
-// * 流程审批记录 服务实现类
-// * </p>
-// *
-// * @author wangliang
-// * @since 2021-08-05
-// */
-//@Service
-//public class TFFlowApproveLogServiceImpl extends ServiceImpl<TFFlowApproveLogMapper, TFFlowApproveLog> implements TFFlowApproveLogService {
-//
-//    @Resource
-//    TFFlowApproveLogMapper tfFlowApproveLogMapper;
-//
-//    /**
-//     * 根据流程id查询流程状态
-//     *
-//     * @param flowId
-//     * @return
-//     */
-//    @Override
-//    public TFFlowApproveLog findByFlowId(Long flowId) {
-//        return tfFlowApproveLogMapper.findByFlowId(flowId);
-//    }
-//}

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

@@ -1,145 +0,0 @@
-//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.FlowApproveResult;
-//import com.qmth.distributed.print.business.entity.TFFlow;
-//import com.qmth.distributed.print.business.entity.TFFlowLog;
-//import com.qmth.distributed.print.business.mapper.TExamTaskFlowMapper;
-//import com.qmth.distributed.print.business.mapper.TFFlowLogMapper;
-//import com.qmth.distributed.print.business.mapper.TFFlowMapper;
-//import com.qmth.distributed.print.business.service.TFFlowService;
-//import com.qmth.teachcloud.common.entity.SysUser;
-//import com.qmth.teachcloud.common.enums.FlowApproveSetupEnum;
-//import com.qmth.teachcloud.common.service.SysUserService;
-//import com.qmth.teachcloud.common.util.ServletUtil;
-//import org.apache.commons.lang3.StringUtils;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Service;
-//
-//import javax.annotation.Resource;
-//import java.util.*;
-//
-///**
-// * <p>
-// * 流程表 服务实现类
-// * </p>
-// *
-// * @author wangliang
-// * @since 2021-08-02
-// */
-//@Service
-//public class TFFlowServiceImpl extends ServiceImpl<TFFlowMapper, TFFlow> implements TFFlowService {
-//
-//    @Resource
-//    TFFlowMapper tfFlowMapper;
-//
-//    @Resource
-//    TExamTaskFlowMapper tExamTaskFlowMapper;
-//
-//    @Resource
-//    TFFlowLogMapper tfFlowLogMapper;
-//
-//    @Autowired
-//    SysUserService sysUserService;
-//
-//    /**
-//     * 流程列表
-//     *
-//     * @param iPage
-//     * @param name
-//     * @param schoolId
-//     * @param orgId
-//     * @return
-//     */
-//    @Override
-//    public IPage<TFFlow> list(IPage<Map> iPage, String name, Long schoolId, Long orgId) {
-//        return tfFlowMapper.list(iPage, name, schoolId, orgId);
-//    }
-//
-//    /**
-//     * 流程审批记录列表
-//     *
-//     * @param iPage
-//     * @param startName
-//     * @param schoolId
-//     * @param orgId
-//     * @param flowId
-//     * @return
-//     */
-//    @Override
-//    public IPage<FlowApproveResult> flowApproveList(IPage<Map> iPage, String status, String startName, Long teachingRoomId, Long createStartTime, Long createEndTime, Long schoolId, Long orgId, Long flowId) {
-//        IPage<FlowApproveResult> flowApproveResultIPage = tfFlowMapper.flowApproveList(iPage, status, startName, teachingRoomId, createStartTime, createEndTime, schoolId, orgId, flowId);
-//        for (FlowApproveResult record : flowApproveResultIPage.getRecords()) {
-//            record.setStatusStr(record.getStatus().getTitle());
-//            // FlowApproveSetupEnum
-//            if (FlowApproveSetupEnum.FINISH.getSetup() == record.getSetup()) {
-//                record.setSetupStr("结束节点");
-//            } else if (FlowApproveSetupEnum.SUBMIT.getSetup() == record.getSetup()) {
-//                record.setSetupStr("开始节点");
-//            } else {
-//                record.setSetupStr("审批节点");
-//            }
-//
-//            Long maxFlowId = tExamTaskFlowMapper.selectMaxFlowIdByExamTaskId(record.getTaskId());
-//            if (Objects.nonNull(maxFlowId)) {
-//                List<TFFlowLog> flowLogs = tfFlowLogMapper.findByFlowId(maxFlowId, Long.parseLong((String) ServletUtil.getRequestHeaderSchoolId()));
-//                TFFlowLog tfFlowLog = flowLogs.stream().sorted(Comparator.comparingLong(TFFlowLog::getCreateTime).reversed()).findFirst().orElse(null);
-//                if (Objects.nonNull(tfFlowLog)) {
-//                    String pendApproveId = tfFlowLog.getPendApproveId();
-//                    if (StringUtils.isNotBlank(pendApproveId)) {
-//                        StringJoiner sj = new StringJoiner(",");
-//                        for (String id : pendApproveId.split(",")) {
-//                            SysUser sysUser = sysUserService.getById(id);
-//                            sj.add(sysUser.getRealName());
-//                        }
-//                        record.setCurrentApproveUserName(sj.toString());
-//                    }
-//                }
-//            }
-//
-//        }
-//        return flowApproveResultIPage;
-//    }
-//
-//    /**
-//     * 流程审批记录找人
-//     *
-//     * @param schoolId
-//     * @param flowId
-//     * @return
-//     */
-//    @Override
-//    public FlowApproveResult flowApproveUserList(Long schoolId, Long flowId) {
-//        return tfFlowMapper.flowApproveUserList(schoolId, flowId);
-//    }
-//
-//    /**
-//     * 根据key查找流程
-//     *
-//     * @param flowKey
-//     * @return
-//     */
-//    @Override
-//    public Integer findByFlowKey(String flowKey) {
-//        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-//        QueryWrapper<TFFlow> tfFlowQueryWrapper = new QueryWrapper<>();
-//        tfFlowQueryWrapper.lambda().eq(TFFlow::getSchoolId, sysUser.getSchoolId())
-//                .eq(TFFlow::getFlowKey, flowKey)
-//                .eq(TFFlow::getEnable, true)
-//                .eq(TFFlow::getPublish, true);
-//        return this.count(tfFlowQueryWrapper);
-//    }
-//
-//    /**
-//     * 根据key查找id
-//     *
-//     * @param flowKey
-//     * @return
-//     */
-//    @Override
-//    public String findActIdByFlowKey(String flowKey) {
-//        return tfFlowMapper.findActIdByFlowKey(flowKey);
-//    }
-//}

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

@@ -18,53 +18,53 @@
         exam_task_id, review_status, reason, operate_id, operate_time
     </sql>
 
-    <select id="list" resultType="com.qmth.distributed.print.business.bean.dto.ReviewLogDto">
+<!--    <select id="list" resultType="com.qmth.distributed.print.business.bean.dto.ReviewLogDto">-->
-        select
+<!--        select-->
-            tffl.id,
+<!--            tffl.id,-->
-            tffl.approve_operation as approvePass,
+<!--            tffl.approve_operation as approvePass,-->
-            tffl.approve_remark as reason,
+<!--            tffl.approve_remark as reason,-->
-            tffl.approve_setup as setUp,
+<!--            tffl.approve_setup as setUp,-->
-            tffl.approve_id as operateId,
+<!--            tffl.approve_id as operateId,-->
-            su.real_name as operateName,
+<!--            su.real_name as operateName,-->
-            tffl.create_time as operateTime
+<!--            tffl.create_time as operateTime-->
-        from
+<!--        from-->
-            t_f_flow_log tffl
+<!--            t_f_flow_log tffl-->
-        left join sys_user su on tffl.approve_id = su.id
+<!--        left join sys_user su on tffl.approve_id = su.id-->
-        where EXISTS(
+<!--        where EXISTS(-->
-            select t.flow_id from t_f_flow_join t
+<!--            select t.flow_id from t_f_flow_join t-->
-        where EXISTS (select tffj.object_id from t_f_flow_join tffj
+<!--        where EXISTS (select tffj.object_id from t_f_flow_join tffj-->
-                where tffj.flow_id = #{flowId} and tffj.object_id = t.object_id)
+<!--                where tffj.flow_id = #{flowId} and tffj.object_id = t.object_id)-->
-        and tffl.flow_id = t.flow_id)
+<!--        and tffl.flow_id = t.flow_id)-->
-        order by tffl.create_time desc
+<!--        order by tffl.create_time desc-->
-    </select>
+<!--    </select>-->
 
-    <select id="findOnePassBySetUp"
+<!--    <select id="findOnePassBySetUp"-->
-            resultType="com.qmth.distributed.print.business.bean.dto.approvalForm.ApprovalInfo">
+<!--            resultType="com.qmth.distributed.print.business.bean.dto.approvalForm.ApprovalInfo">-->
-        SELECT
+<!--        SELECT-->
-            tffl.approve_remark AS remark,
+<!--            tffl.approve_remark AS remark,-->
-            tffl.approve_setup AS level,
+<!--            tffl.approve_setup AS level,-->
-            tffl.approve_id AS approveId,
+<!--            tffl.approve_id AS approveId,-->
-            su.real_name AS approveName,
+<!--            su.real_name AS approveName,-->
-            tffl.create_time AS time
+<!--            tffl.create_time AS time-->
-        FROM
+<!--        FROM-->
-            t_f_flow_log tffl
+<!--            t_f_flow_log tffl-->
-                LEFT JOIN
+<!--                LEFT JOIN-->
-            sys_user su ON tffl.approve_id = su.id
+<!--            sys_user su ON tffl.approve_id = su.id-->
-        <where>
+<!--        <where>-->
-            AND tffl.approve_operation = 'APPROVE'
+<!--            AND tffl.approve_operation = 'APPROVE'-->
-            <if test="flowId > 0 and flowId != ''">
+<!--            <if test="flowId > 0 and flowId != ''">-->
-                AND EXISTS(
+<!--                AND EXISTS(-->
-                select t.flow_id from t_f_flow_join t
+<!--                select t.flow_id from t_f_flow_join t-->
-                where EXISTS (select tffj.object_id from t_f_flow_join tffj
+<!--                where EXISTS (select tffj.object_id from t_f_flow_join tffj-->
-                where tffj.flow_id = #{flowId} and tffj.object_id = t.object_id)
+<!--                where tffj.flow_id = #{flowId} and tffj.object_id = t.object_id)-->
-                and tffl.flow_id = t.flow_id)
+<!--                and tffl.flow_id = t.flow_id)-->
-            </if>
+<!--            </if>-->
-            <if test="setup != null and setup != ''">
+<!--            <if test="setup != null and setup != ''">-->
-                AND tffl.approve_setup = #{setup}
+<!--                AND tffl.approve_setup = #{setup}-->
-            </if>
+<!--            </if>-->
-        </where>
+<!--        </where>-->
-        ORDER BY tffl.create_time DESC
+<!--        ORDER BY tffl.create_time DESC-->
-        LIMIT 1
+<!--        LIMIT 1-->
-    </select>
+<!--    </select>-->
 
 </mapper>

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

@@ -237,14 +237,14 @@ public class ExamTaskController {
         return ResultUtil.ok(true);
     }
 
-    /**
+//    /**
-     * 审核历史
+//     * 审核历史
-     */
+//     */
-    @ApiOperation(value = "审核历史")
+//    @ApiOperation(value = "审核历史")
-    @RequestMapping(value = "/review_list", method = RequestMethod.POST)
+//    @RequestMapping(value = "/review_list", method = RequestMethod.POST)
-    public Result reviewList(@ApiParam(value = "流程id", required = true) @RequestParam String flowId) {
+//    public Result reviewList(@ApiParam(value = "流程id", required = true) @RequestParam String flowId) {
-        return ResultUtil.ok(examTaskReviewLogService.list(SystemConstant.convertIdToLong(flowId)));
+//        return ResultUtil.ok(examTaskReviewLogService.list(SystemConstant.convertIdToLong(flowId)));
-    }
+//    }
 
     /**
      * 入库申请-查询

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

@@ -1,299 +0,0 @@
-//package com.qmth.distributed.print.api;
-//
-//import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-//import com.google.common.reflect.TypeToken;
-//import com.google.gson.Gson;
-//import com.qmth.boot.api.constant.ApiConstant;
-//import com.qmth.boot.api.exception.ApiException;
-//import com.qmth.distributed.print.business.bean.params.FlowApproveParam;
-//import com.qmth.distributed.print.business.bean.params.FlowParam;
-//import com.qmth.distributed.print.business.bean.params.FlowTaskApproveParam;
-//import com.qmth.distributed.print.business.bean.result.EditResult;
-////import com.qmth.distributed.print.business.bean.result.FlowApproveResult;
-//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.*;
-//import com.qmth.distributed.print.business.enums.MessageEnum;
-//import com.qmth.distributed.print.business.service.*;
-//import com.qmth.teachcloud.common.bean.params.ApproveUserResult;
-//import com.qmth.teachcloud.common.contant.SystemConstant;
-//import com.qmth.teachcloud.common.entity.BasicAttachment;
-//import com.qmth.teachcloud.common.entity.SysUser;
-//import com.qmth.teachcloud.common.enums.*;
-//import com.qmth.teachcloud.common.service.BasicAttachmentService;
-//import com.qmth.teachcloud.common.service.SysUserService;
-//import com.qmth.teachcloud.common.util.JacksonUtil;
-//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.TaskService;
-//import org.activiti.engine.task.Task;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.dao.DuplicateKeyException;
-//import org.springframework.transaction.annotation.Transactional;
-//import org.springframework.validation.BindingResult;
-//import org.springframework.validation.annotation.Validated;
-//import org.springframework.web.bind.annotation.*;
-//import org.springframework.web.multipart.MultipartFile;
-//
-//import javax.annotation.Resource;
-//import javax.validation.Valid;
-//import javax.validation.constraints.Max;
-//import javax.validation.constraints.Min;
-//import java.io.IOException;
-//import java.util.*;
-//
-///**
-// * <p>
-// * 流程表 前端控制器
-// * </p>
-// *
-// * @author wangliang
-// * @since 2021-08-02
-// */
-//@Api(tags = "流程Controller")
-//@RestController
-//@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.flow}")
-////@Aac(auth = BOOL.FALSE, strict = BOOL.FALSE)
-//@Validated
-//public class TFFlowController {
-//    private final static Logger log = LoggerFactory.getLogger(TFFlowController.class);
-//
-//    @Resource
-//    PrintCommonService printCommonService;
-//
-//    @Resource
-//    BasicAttachmentService basicAttachmentService;
-//
-//    @Resource
-//    ActivitiService activitiService;
-//
-//    @Resource
-//    TFFlowService tfFlowService;
-//
-//    @Resource
-//    TFFlowApproveLogService tfFlowApproveLogService;
-//
-//    @Autowired
-//    SysUserService sysUserService;
-//
-//    @Autowired
-//    BasicMessageService basicMessageService;
-//
-//    @Resource
-//    TaskService taskService;
-//
-//    @Resource
-//    TExamTaskFlowService tExamTaskFlowService;
-//
-//    @ApiOperation(value = "注册流程")
-//    @Transactional
-//    @ApiResponses({@ApiResponse(code = 200, message = "常规信息", response = ResultUtil.class)})
-//    @RequestMapping(value = "/register", method = RequestMethod.POST)
-//    public Result register(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file,
-//                           @ApiParam(value = "流程文件名称", required = true) @RequestParam String name) {
-//        BasicAttachment basicAttachment = null;
-//        try {
-//            int temp = file.getOriginalFilename().lastIndexOf(".");
-//            String fileName = file.getOriginalFilename().substring(0, temp);
-//            String format = file.getOriginalFilename().substring(temp, file.getOriginalFilename().length());
-//            if (!format.equalsIgnoreCase(".bpmn")) {
-//                throw ExceptionResultEnum.ERROR.exception("上传的流程文件格式只能为.bmpn");
-//            }
-//            basicAttachment = printCommonService.saveAttachment(file, ServletUtil.getRequestMd5(), UploadFileEnum.FILE);
-//            if (Objects.isNull(basicAttachment)) {
-//                throw ExceptionResultEnum.ATTACHMENT_ERROR.exception();
-//            }
-//            activitiService.uploadDeployment(file);
-//            String actFlowId = tfFlowService.findActIdByFlowKey(SystemConstant.GDYKDX_FLOW_KEY);
-//            SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-//            TFFlow tfFlow = new TFFlow(SystemConstant.getHeadOrUserSchoolId(), sysUser.getOrgId(), name, sysUser.getId(), fileName, actFlowId);
-//            tfFlowService.save(tfFlow);
-//        } catch (Exception e) {
-//            log.error(SystemConstant.LOG_ERROR, e);
-//            if (Objects.nonNull(basicAttachment)) {
-//                basicAttachmentService.deleteAttachment(basicAttachment);
-//            }
-//            if (e instanceof DuplicateKeyException) {
-//                String errorColumn = e.getCause().toString();
-//                String columnStr = errorColumn.substring(errorColumn.lastIndexOf("key") + 3, errorColumn.length()).replaceAll("'", "");
-//                throw ExceptionResultEnum.SQL_ERROR.exception("[" + FieldUniqueEnum.convertToTitle(columnStr) + "]数据不允许重复插入");
-//            } else if (e instanceof ApiException) {
-//                ResultUtil.error((ApiException) e, e.getMessage());
-//            } else {
-//                ResultUtil.error(e.getMessage());
-//            }
-//        }
-//        return ResultUtil.ok(new EditResult(basicAttachment.getId()));
-//    }
-//
-////    @ApiOperation(value = "发布流程")
-////    @ApiResponses({@ApiResponse(code = 200, message = "常规信息", response = ResultUtil.class)})
-////    @RequestMapping(value = "/publish", method = RequestMethod.POST)
-////    public Result publish(@ApiParam(value = "流程文件id", required = true) @RequestParam String id) {
-////        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-////        UpdateWrapper tfFlowUpdateWrapper = new UpdateWrapper<>();
-////        tfFlowUpdateWrapper.lambda().eq(TFFlow::getId, Long.parseLong(id))
-////                .set(TFFlow::getPublish, true)
-////                .set(TFFlow::getUpdateId, sysUser.getId())
-////                .set(TFFlow::getUpdateTime, System.currentTimeMillis());
-////        return ResultUtil.ok(tfFlowService.update(tfFlowUpdateWrapper));
-////    }
-//
-//    @ApiOperation(value = "流程逻辑删除")
-//    @ApiResponses({@ApiResponse(code = 200, message = "常规信息", response = ResultUtil.class)})
-//    @RequestMapping(value = "/enable", method = RequestMethod.POST)
-//    public Result enable(@Valid @RequestBody FlowParam flowParam, BindingResult bindingResult) {
-//        if (bindingResult.hasErrors()) {
-//            return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
-//        }
-//        return ResultUtil.ok(activitiService.flowDelete(flowParam.getId()));
-//    }
-//
-//    @ApiOperation(value = "流程列表")
-//    @ApiResponses({@ApiResponse(code = 200, message = "流程信息", response = TFFlow.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,
-//                       @ApiParam(value = "数量", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-//        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-//        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 = "/task/approve", method = RequestMethod.POST)
-//    public Result taskApprove(@Valid @RequestBody FlowTaskApproveParam flowTaskApproveParam, BindingResult bindingResult) {
-//        if (bindingResult.hasErrors()) {
-//            return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
-//        }
-//        Map<String, Object> map = new HashMap<>();
-//        map.computeIfAbsent(SystemConstant.FLOW_TASK_ID, v -> flowTaskApproveParam.getTaskId());
-//        map.computeIfAbsent(SystemConstant.APPROVE_OPERATION, v -> flowTaskApproveParam.getApprovePass());
-//        map.computeIfAbsent(SystemConstant.APPROVE_REMARK, v -> flowTaskApproveParam.getRemark());
-//        map.computeIfAbsent(SystemConstant.APPROVE_SETUP, v -> flowTaskApproveParam.getSetup());
-//        map.computeIfAbsent(SystemConstant.APPROVE_USER_IDS, v -> flowTaskApproveParam.getApproveUserIds());
-//        map.computeIfAbsent(SystemConstant.USER_TASK_ID, v -> flowTaskApproveParam.getUsertaskId());
-//        Map<String, Object> objectMap = activitiService.taskApprove(map);
-//        if (Objects.nonNull(objectMap)) {
-//            TFFlowApprove tfFlowApprove = (TFFlowApprove) objectMap.get("tfFlowApprove");
-//            ExamTask examTask = (ExamTask) objectMap.get("examTask");
-//            boolean presidentApprove = Objects.nonNull(objectMap.get(SystemConstant.APPROVE_PRESIDENT_SYSTEM)) ? (boolean) objectMap.get(SystemConstant.APPROVE_PRESIDENT_SYSTEM) : false;
-//            //审核通过，生成pdf
-//            if (Objects.nonNull(tfFlowApprove) && FlowApproveSetupEnum.FINISH.getSetup() == tfFlowApprove.getSetup()) {
-//                // 取命题老师ID
-//                SysUser sysUser = sysUserService.getById(examTask.getUserId());
-//                try {
-//                    printCommonService.checkData(examTask.getSchoolId(), examTask.getCourseCode(), examTask.getPaperNumber(), sysUser);
-//                } catch (IOException e) {
-//                    throw ExceptionResultEnum.ERROR.exception("生成pdf失败");
-//                }
-//            } else if (Objects.nonNull(tfFlowApprove) && FlowApproveSetupEnum.THREE_APPROVE.getSetup() == tfFlowApprove.getSetup() && presidentApprove) {//命题老师后台提交
-//                TExamTaskFlow tExamTaskFlow = tExamTaskFlowService.findByFlowLevel(examTask.getId());
-//                Task task = taskService.createTaskQuery().processInstanceId(String.valueOf(tExamTaskFlow.getFlowId())).singleResult();
-//                if (Objects.nonNull(task)) {
-//                    Map<String, Object> mapObject = new HashMap<>();
-//                    mapObject.computeIfAbsent(SystemConstant.FLOW_TASK_ID, v -> task.getId());
-//                    mapObject.computeIfAbsent(SystemConstant.APPROVE_PRESIDENT_SYSTEM, v -> presidentApprove);
-//                    activitiService.taskApprove(mapObject);
-//                }
-//            }
-//
-//            // 驳回短信（驳回给提交老师）
-//            if (tfFlowApprove.getStatus() == FlowStatusEnum.REJECT
-//                    && (tfFlowApprove.getSetup().intValue() == FlowApproveSetupEnum.SUBMIT.getSetup())
-//                    || tfFlowApprove.getSetup().intValue() == FlowApproveSetupEnum.THREE_APPROVE.getSetup()) {
-//                List<SysUser> sysUsers = sysUserService.listByIds(Arrays.asList(examTask.getUserId()));
-//                List<ApproveUserResult> sysUserList = new Gson().fromJson(JacksonUtil.parseJson(sysUsers), new TypeToken<List<ApproveUserResult>>() {
-//                }.getType());
-//                basicMessageService.sendNoticeTaskAuditFlow(examTask, sysUserList, MessageEnum.NOTICE_OF_AUDIT_REJECT);
-//            }
-//        }
-//        return ResultUtil.ok();
-//    }
-//
-//    @ApiOperation(value = "流程审批记录列表")
-//    @ApiResponses({@ApiResponse(code = 200, message = "流程审批记录信息", response = FlowApproveResult.class)})
-//    @RequestMapping(value = "/approve/list", method = RequestMethod.POST)
-//    public Result taskApproveList(@ApiParam(value = "状态", required = false) @RequestParam(required = false) String status,
-//                                  @ApiParam(value = "发起人名称", required = false) @RequestParam(required = false) String startName,
-//                                  @ApiParam(value = "教研室", required = false) @RequestParam(required = false) Long teachingRoomId,
-//                                  @ApiParam(value = "提交开始时间", required = false) @RequestParam(required = false) Long createStartTime,
-//                                  @ApiParam(value = "提交结束时间", required = false) @RequestParam(required = false) Long createEndTime,
-//                                  @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) {
-//        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-//        return ResultUtil.ok(tfFlowService.flowApproveList(new Page<>(pageNumber, pageSize), status, startName, teachingRoomId, createStartTime, createEndTime, SystemConstant.getHeadOrUserSchoolId(), sysUser.getOrgId(), null));
-//    }
-//
-//    @ApiOperation(value = "流程审批记录逻辑删除")
-//    @ApiResponses({@ApiResponse(code = 200, message = "常规信息", response = ResultUtil.class)})
-//    @RequestMapping(value = "/approve/enable", method = RequestMethod.POST)
-//    public Result enable(@Valid @RequestBody FlowApproveParam flowApproveParam, BindingResult bindingResult) {
-//        if (bindingResult.hasErrors()) {
-//            return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
-//        }
-//        UpdateWrapper<TFFlowApproveLog> tfFlowApproveLogUpdateWrapper = new UpdateWrapper<>();
-//        tfFlowApproveLogUpdateWrapper.lambda().eq(TFFlowApproveLog::getFlowId, flowApproveParam.getFlowId())
-//                .set(TFFlowApproveLog::getEnable, flowApproveParam.getEnable());
-//        return ResultUtil.ok(tfFlowApproveLogService.update(tfFlowApproveLogUpdateWrapper));
-//    }
-//
-//    @ApiOperation(value = "流程终止")
-//    @ApiResponses({@ApiResponse(code = 200, message = "常规信息", response = ResultUtil.class)})
-//    @RequestMapping(value = "/end", method = RequestMethod.POST)
-//    public Result end(@ApiParam(value = "流程id", required = true) @RequestParam String flowId) {
-//        activitiService.flowEnd(flowId);
-//        return ResultUtil.ok();
-//    }
-//
-//    @ApiOperation(value = "获取所有流程节点")
-//    @ApiResponses({@ApiResponse(code = 200, message = "流程节点", response = FlowTaskResult.class)})
-//    @RequestMapping(value = "/task/all", method = RequestMethod.POST)
-//    public Result taskAll(@ApiParam(value = "流程id", required = true) @RequestParam String flowId) {
-//        return ResultUtil.ok(activitiService.getTaskAll(flowId));
-//    }
-//
-//    @ApiOperation(value = "获取所有流程节点待审批人")
-//    @ApiResponses({@ApiResponse(code = 200, message = "流程节点待审批人", response = FlowTaskApprovePeopleAllResult.class)})
-//    @RequestMapping(value = "/task/approver/people_all", method = RequestMethod.POST)
-//    public Result taskApproverPeopleAll(@ApiParam(value = "课程编码", required = false) @RequestParam(required = false) String courseCode,
-//                                        @ApiParam(value = "流程节点id", required = false) @RequestParam(required = false) String taskId) {
-//        return ResultUtil.ok(activitiService.taskApproverPeopleAll(courseCode, taskId));
-//    }
-//
-//    @ApiOperation(value = "流程节点转他人审批")
-//    @ApiResponses({@ApiResponse(code = 200, message = "常规信息", response = ResultUtil.class)})
-//    @RequestMapping(value = "/task/approver/exchange", method = RequestMethod.POST)
-//    public Result taskApproverExchange(@ApiParam(value = "审批人id", required = true) @RequestParam String userId,
-//                                       @ApiParam(value = "流程节点id", required = true) @RequestParam String taskId) {
-//        return ResultUtil.ok(activitiService.taskApproverExchange(userId, taskId));
-//    }
-//
-//    @ApiOperation(value = "获取转他人审批人")
-//    @ApiResponses({@ApiResponse(code = 200, message = "流程节点审批人", response = FlowTaskApprovePeopleAllResult.class)})
-//    @RequestMapping(value = "/task/approver/exchange/people", method = RequestMethod.POST)
-//    public Result taskApproverExchangePeople(@ApiParam(value = "流程节点id", required = true) @RequestParam String taskId,
-//                                             @ApiParam(value = "用户姓名", required = false) @RequestParam(required = false) String realName) {
-//        return ResultUtil.ok(activitiService.taskApproverExchangePeople(taskId, realName));
-//    }
-//
-//    @ApiOperation(value = "获取下级节点审批人")
-//    @ApiResponses({@ApiResponse(code = 200, message = "流程节点审批人", response = FlowTaskApprovePeopleAllResult.class)})
-//    @RequestMapping(value = "/task/approver/next/people", method = RequestMethod.POST)
-//    public Result taskApproverNextPeople(@ApiParam(value = "课程编码", required = false) @RequestParam(required = false) String courseCode,
-//                                         @ApiParam(value = "流程节点id", required = false) @RequestParam(required = false) String taskId) {
-//        return ResultUtil.ok(activitiService.taskApproverNextPeople(courseCode, taskId));
-//    }
-//
-//    @ApiOperation(value = "获取提交记录")
-//    @ApiResponses({@ApiResponse(code = 200, message = "流程提交记录", response = FlowTaskApprovePeopleAllResult.class)})
-//    @RequestMapping(value = "/task/approver/submit/list", method = RequestMethod.POST)
-//    public Result taskApproverSubmitList(@ApiParam(value = "考试任务id", required = true) @RequestParam String examTaskId) {
-//        return ResultUtil.ok(activitiService.taskApproverSubmitList(examTaskId));
-//    }
-//}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/SysUserService.java

@@ -107,60 +107,6 @@ public interface SysUserService extends IService<SysUser> {
      */
     Map<String, Object> executeSysUserImportLogic(List<LinkedMultiValueMap<Integer, Object>> finalList, Map<String, Object> map) throws NoSuchAlgorithmException;
 
-    /**
-     * 获取命题审批人
-     *
-     * @param courseCode
-     * @param realName
-     * @return
-     */
-    public List<ApproveUserResult> findByAssignApprove(String courseCode, String realName);
-
-    /**
-     * 获取命题审批人
-     *
-     * @param realName
-     * @return
-     */
-    public List<ApproveUserResult> findByJxzyyAssignApprove(String realName);
-
-    /**
-     * 获取教研室主任审批人
-     *
-     * @param courseCode
-     * @param realName
-     * @return
-     */
-    public List<ApproveUserResult> findByDirectorApprove(String courseCode, String realName);
-
-    /**
-     * 获取教研室主任审批人
-     *
-     * @param realName
-     * @param flowApproveNameEnum
-     * @return
-     */
-    public List<ApproveUserResult> findByJxzyyDirectorApprove(String realName, FlowApproveNameEnum flowApproveNameEnum);
-
-    /**
-     * 获取院长审批人
-     *
-     * @param orgIds
-     * @param realName
-     * @return
-     */
-    public List<ApproveUserResult> findByPresidentApprove(List<Long> orgIds, String realName);
-
-    /**
-     * 获取主任或院长审批人
-     *
-     * @param orgIds
-     * @param realName
-     * @param flowApproveNameEnum
-     * @return
-     */
-    public List<ApproveUserResult> findByJxzyyTopDirectorOrPresidentApprove(List<Long> orgIds, String realName, FlowApproveNameEnum flowApproveNameEnum);
-
     /**
      * 获取同级别下一级审批人
      *

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/SysUserServiceImpl.java

@@ -790,175 +790,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return map;
     }
 
-    /**
-     * 获取命题审批人
-     *
-     * @param courseCode courseCode
-     * @param realName   realName
-     * @return return
-     */
-    @Override
-    public List<ApproveUserResult> findByAssignApprove(String courseCode, String realName) {
-        Long schoolId = SystemConstant.getHeadOrUserSchoolId();
-        QueryWrapper<BasicCourse> basicCourseQueryWrapper = new QueryWrapper<>();
-        basicCourseQueryWrapper.lambda().eq(BasicCourse::getSchoolId, schoolId)
-                .eq(BasicCourse::getCode, courseCode)
-                .eq(BasicCourse::getEnable, true);
-        BasicCourse basicCourse = basicCourseService.getOne(basicCourseQueryWrapper);
-        Optional.ofNullable(basicCourse).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("课程数据为空"));
-        List<SysOrg> sysOrgList = sysOrgService.findByConnectByRootOrgId(basicCourse.getTeachingRoomId());
-        Set<Long> orgIds = sysOrgList.stream().map(s -> s.getId()).collect(Collectors.toSet());
-        return sysUserService.filterFlowPrivilege(schoolId, orgIds, false, null, realName);
-    }
-
-    /**
-     * 获取命题审批人
-     *
-     * @param realName
-     * @return
-     */
-    @Override
-    public List<ApproveUserResult> findByJxzyyAssignApprove(String realName) {
-        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        List<SysOrg> sysOrgList = sysOrgService.findByConnectByRootOrgId(sysUser.getOrgId());
-        Set<Long> orgIds = sysOrgList.stream().map(s -> s.getId()).collect(Collectors.toSet());
-        return sysUserService.filterFlowPrivilege(sysUser.getSchoolId(), orgIds, false, null, realName);
-    }
-
-    /**
-     * 获取教研室主任审批人
-     *
-     * @param courseCode courseCode
-     * @param realName   realName
-     * @return return
-     */
-    @Override
-    public List<ApproveUserResult> findByDirectorApprove(String courseCode, String realName) {
-        Long schoolId = SystemConstant.getHeadOrUserSchoolId();
-        QueryWrapper<BasicCourse> basicCourseQueryWrapper = new QueryWrapper<>();
-        basicCourseQueryWrapper.lambda().eq(BasicCourse::getSchoolId, schoolId)
-                .eq(BasicCourse::getCode, courseCode);
-        BasicCourse basicCourse = basicCourseService.getOne(basicCourseQueryWrapper);
-
-        Optional.ofNullable(basicCourse).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("课程数据为空"));
-        Optional.ofNullable(basicCourse.getTeachingRoomId()).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("课程机构为空"));
-        List<SysOrg> sysOrgList = sysOrgService.findByConnectByRootOrgId(basicCourse.getTeachingRoomId());
-        Set<Long> orgIds = sysOrgList.stream().map(s -> s.getId()).collect(Collectors.toSet());
-        List<ApproveUserResult> approveUserResultList = sysUserService.filterFlowPrivilege(schoolId, orgIds, true, FlowApproveNameEnum.DIRECTOR, realName);
-//        if (Objects.isNull(approveUserResultList) || approveUserResultList.size() == 0) {
-//            throw ExceptionResultEnum.ERROR.exception("课程["+ basicCourse.getName() + "]未配置主任审批人");
-//        }
-        return approveUserResultList;
-    }
-
-    /**
-     * 获取教研室主任审批人
-     *
-     * @param realName
-     * @param flowApproveNameEnum
-     * @return
-     */
-    @Override
-    public List<ApproveUserResult> findByJxzyyDirectorApprove(String realName, FlowApproveNameEnum flowApproveNameEnum) {
-        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        AuthBean authBean = teachcloudCommonService.getUserAuth(sysUser.getId());
-        Set<SysRolePrivilege> sysRolePrivilegeSet = new HashSet<>();
-        for (SysRole s : authBean.getRoleList()) {
-            sysRolePrivilegeSet.addAll(teachcloudCommonService.getRolePrivilege(s.getId()));
-        }
-        boolean cjmt = false, cjss = false;
-        List<SysPrivilege> sysPrivilegeList = sysPrivilegeService.list(new QueryWrapper<SysPrivilege>().lambda().in(SysPrivilege::getUrl, Arrays.asList(FlowApproveNameEnum.DIRECTOR.getId(), FlowApproveNameEnum.PRESIDENT.getId())));
-        go:
-        for (SysRolePrivilege sysRolePrivilege : sysRolePrivilegeSet) {
-            for (SysPrivilege sysPrivilege : sysPrivilegeList) {
-                if (Objects.equals(sysPrivilege.getUrl(), FlowApproveNameEnum.DIRECTOR.getId()) && sysRolePrivilege.getPrivilegeId().longValue() == sysPrivilege.getId().longValue()) {
-                    cjmt = true;
-                } else if (Objects.equals(sysPrivilege.getUrl(), FlowApproveNameEnum.PRESIDENT.getId()) && sysRolePrivilege.getPrivilegeId().longValue() == sysPrivilege.getId().longValue()) {
-                    cjss = true;
-                }
-            }
-            if (cjmt && cjss) {
-                break go;
-            }
-        }
-        SysOrg sysOrg = authBean.getOrg();
-        if (sysOrg.getType() == OrgTypeEnum.SCHOOL) {//学校下是实施人员或者超级老师
-            List<ApproveUserResult> approveUserResultList = new ArrayList<>();
-            if (cjss && cjmt) {
-                List<ApproveUserResult> presidentList = this.findByJxzyyTopDirectorOrPresidentApprove(Arrays.asList(sysOrg.getId()), realName, FlowApproveNameEnum.PRESIDENT);
-                List<ApproveUserResult> directorList = this.findByJxzyyTopDirectorOrPresidentApprove(Arrays.asList(sysOrg.getId()), realName, FlowApproveNameEnum.DIRECTOR);
-                approveUserResultList.addAll(presidentList);
-                approveUserResultList.addAll(directorList);
-                Set<ApproveUserResult> approveUserResultSet = new HashSet<>(approveUserResultList);
-                approveUserResultList = new ArrayList<>(approveUserResultSet);
-            } else if (cjss) {
-                approveUserResultList = this.findByJxzyyTopDirectorOrPresidentApprove(Arrays.asList(sysOrg.getId()), realName, FlowApproveNameEnum.PRESIDENT);
-            } else if (cjmt && flowApproveNameEnum == FlowApproveNameEnum.DIRECTOR) {
-                approveUserResultList = this.findByJxzyyTopDirectorOrPresidentApprove(Arrays.asList(sysOrg.getId()), realName, FlowApproveNameEnum.DIRECTOR);
-            }
-            return approveUserResultList;
-        } else {//否则是学校命题老师
-            if (flowApproveNameEnum == FlowApproveNameEnum.DIRECTOR) {
-                List<ApproveUserResult> approveUserResultList = this.findByJxzyyTopDirectorOrPresidentApprove(Arrays.asList(sysOrg.getId()), realName, FlowApproveNameEnum.DIRECTOR);
-                List<SysOrg> sysOrgList = sysOrgService.findByConnectByParentId(sysUser.getOrgId(), true, false);
-                Set<Long> orgIds = sysOrgList.stream().map(s -> s.getId()).collect(Collectors.toSet());
-                approveUserResultList.addAll(sysUserService.filterFlowPrivilege(sysUser.getSchoolId(), orgIds, true, FlowApproveNameEnum.DIRECTOR, realName));
-                return approveUserResultList;
-            } else {
-                return null;
-            }
-        }
-    }
-
-    /**
-     * 获取院长审批人
-     *
-     * @param orgIds   orgIds
-     * @param realName realName
-     * @return return
-     */
-    @Override
-    public List<ApproveUserResult> findByPresidentApprove(List<Long> orgIds, String realName) {
-        if (Objects.nonNull(orgIds) && orgIds.size() > 0) {
-            Long schoolId = SystemConstant.getHeadOrUserSchoolId();
-            Set<SysOrg> sysOrgSet = new HashSet<>();
-            for (Long l : orgIds) {
-                sysOrgSet.addAll(sysOrgService.findByConnectByParentId(l, true, false));
-            }
-            Set<Long> orgIdsSet = sysOrgSet.stream().map(s -> s.getId()).collect(Collectors.toSet());
-            List<ApproveUserResult> approveUserResultList = sysUserService.filterFlowPrivilege(schoolId, orgIdsSet, true, FlowApproveNameEnum.PRESIDENT, realName);
-//        if (Objects.isNull(approveUserResultList) || approveUserResultList.size() == 0) {
-//            throw ExceptionResultEnum.ERROR.exception("未配置院长审批人");
-//        }
-            return approveUserResultList;
-        } else {
-            return new ArrayList<>();
-        }
-    }
-
-    /**
-     * 获取院长审批人
-     *
-     * @param orgIds
-     * @param realName
-     * @return
-     */
-    @Override
-    public List<ApproveUserResult> findByJxzyyTopDirectorOrPresidentApprove(List<Long> orgIds, String realName, FlowApproveNameEnum flowApproveNameEnum) {
-        if (Objects.nonNull(orgIds) && orgIds.size() > 0) {
-            Long schoolId = SystemConstant.getHeadOrUserSchoolId();
-            Set<SysOrg> sysOrgSet = new HashSet<>();
-            for (Long l : orgIds) {
-                sysOrgSet.addAll(sysOrgService.findByJxzyyConnectByParentId(l, OrgTypeEnum.SCHOOL));
-            }
-            Set<Long> orgIdsSet = sysOrgSet.stream().map(s -> s.getId()).collect(Collectors.toSet());
-            List<ApproveUserResult> approveUserResultList = sysUserService.filterFlowPrivilege(schoolId, orgIdsSet, true, flowApproveNameEnum, realName);
-            return approveUserResultList;
-        } else {
-            return new ArrayList<>();
-        }
-    }
-
     /**
      * 获取同级别下一级审批人
      *