fix:审核表

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

@@ -1,6 +1,7 @@
 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.result.TFFlowLogResult;
 import com.qmth.distributed.print.business.entity.TFFlowLog;
 import com.qmth.teachcloud.common.enums.FlowApproveOperationEnum;
@@ -43,4 +44,11 @@ public interface TFFlowLogService extends IService<TFFlowLog> {
      * @return
      */
     TFFlowLog findByLast(Long flowId, Long schoolId, FlowApproveOperationEnum flowApproveOperationEnum);
+
+    /**
+     * 根据流程id查询审批表
+     * @param flowId 流程id
+     * @return 审批表
+     */
+    List<ApprovalInfo> findApprovalInfoByFlowId(Long flowId);
 }

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

@@ -169,6 +169,8 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
 
     @Resource
     BasicPrintConfigService basicPrintConfigService;
+    @Resource
+    TFFlowLogService tfFlowLogService;
 
     @Override
     public List<ExamTask> listByCourseCode(Long schoolId, String code) {
@@ -1833,7 +1835,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         final String link = ",";
         List<ApprovalInfo> approvalInfoList = new ArrayList<>();
         if (review) {
-            //TODO 主任和院长审核需修改
+//            //TODO 主任和院长审核需修改
 //            ApprovalInfo second = examTaskReviewLogService.findOnePassBySetUp(flowId, 2);
 //            if (Objects.isNull(second)) {
 //                throw ExceptionResultEnum.ERROR.exception("未找到主任级审核记录");
@@ -1859,22 +1861,23 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
 //            third.setRemark(thirdRemark);
 //            approvalInfoList.add(second);
 //            approvalInfoList.add(third);
+            approvalInfoList = tfFlowLogService.findApprovalInfoByFlowId(flowId);
         }
 
         // 2.ExamRoomInfo 部分
         List<PrintPlanStatusEnum> printPlanStatusEnumList = new ArrayList<>();
         printPlanStatusEnumList.add(PrintPlanStatusEnum.PRINTING);
         printPlanStatusEnumList.add(PrintPlanStatusEnum.PRINT_FINISH);
-        List<ExamPackageDetail> examPackageDetailDatasource = this.baseMapper.findExamPackageDetailByPaperNumber(schoolId, examTask.getCourseCode(), paperNumber, printPlanStatusEnumList);
+        List<ExamPackageDetail> examPackageDetailDatasource = this.baseMapper.findExamPackageDetailByPaperNumber(schoolId, examTask.getCourseCode(), paperNumber, null);
         if (examPackageDetailDatasource.size() == 0) {
             throw ExceptionResultEnum.ERROR.exception("任务处理中，请稍后查看！");
         }
-        for (ExamPackageDetail packageDetail : examPackageDetailDatasource) {
-            ExamDetailStatusEnum examDetailStatusEnum = packageDetail.getExamDetailStatus();
-            if (ExamDetailStatusEnum.NEW.equals(examDetailStatusEnum) || ExamDetailStatusEnum.READY.equals(examDetailStatusEnum)) {
-                throw ExceptionResultEnum.ERROR.exception("任务处理中，请稍后查看！");
-            }
-        }
+//        for (ExamPackageDetail packageDetail : examPackageDetailDatasource) {
+//            ExamDetailStatusEnum examDetailStatusEnum = packageDetail.getExamDetailStatus();
+//            if (ExamDetailStatusEnum.NEW.equals(examDetailStatusEnum) || Exam etailStatusEnum.READY.equals(examDetailStatusEnum)) {
+//                throw ExceptionResultEnum.ERROR.exception("任务处理中，请稍后查看！");
+//            }
+//        }
         ExamObjectDto examObjectDto = this.buildExamObjectDtoByPackageDatasource(examPackageDetailDatasource);
 
 

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

@@ -1,14 +1,18 @@
 package com.qmth.distributed.print.business.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.result.TFFlowLogResult;
 import com.qmth.distributed.print.business.entity.TFFlowLog;
 import com.qmth.distributed.print.business.mapper.TFFlowLogMapper;
 import com.qmth.distributed.print.business.service.TFFlowLogService;
 import com.qmth.teachcloud.common.enums.FlowApproveOperationEnum;
+import com.qmth.teachcloud.common.service.SysUserService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
@@ -25,6 +29,8 @@ public class TFFlowLogServiceImpl extends ServiceImpl<TFFlowLogMapper, TFFlowLog
 
     @Resource
     TFFlowLogMapper tfFlowLogMapper;
+    @Resource
+    SysUserService sysUserService;
 
     /**
      * 根据流程id查询流程状态
@@ -61,4 +67,22 @@ public class TFFlowLogServiceImpl extends ServiceImpl<TFFlowLogMapper, TFFlowLog
     public TFFlowLog findByLast(Long flowId, Long schoolId, FlowApproveOperationEnum flowApproveOperationEnum) {
         return tfFlowLogMapper.findByLast(flowId, schoolId, Objects.nonNull(flowApproveOperationEnum) ? flowApproveOperationEnum.name() : null);
     }
+
+    @Override
+    public List<ApprovalInfo> findApprovalInfoByFlowId(Long flowId) {
+        List<ApprovalInfo> approvalInfoList = new ArrayList<>();
+        List<TFFlowLog> tfFlowLogList = this.list(new QueryWrapper<TFFlowLog>().lambda()
+                .eq(TFFlowLog::getFlowId,flowId)
+                .ne(TFFlowLog::getApproveOperation,FlowApproveOperationEnum.SUBMIT));
+        for (TFFlowLog tfFlowLog : tfFlowLogList) {
+            ApprovalInfo approvalInfo = new ApprovalInfo();
+            Long approveId = tfFlowLog.getApproveId();
+            approvalInfo.setApproveId(approveId);
+            approvalInfo.setApproveName(sysUserService.getById(approveId).getRealName());
+            approvalInfo.setTime(tfFlowLog.getUpdateTime());
+            approvalInfo.setRemark(tfFlowLog.getApproveRemark());
+            approvalInfoList.add(approvalInfo);
+        }
+        return approvalInfoList;
+    }
 }