|
|
@@ -990,7 +990,6 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
|
|
|
if (Objects.nonNull(task)) {
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
map.computeIfAbsent(SystemConstant.FLOW_TASK_ID, v -> task.getId());
|
|
|
-// map.computeIfAbsent(SystemConstant.APPROVE_USER_IDS, v -> examTaskDetail.getApproveUserIds());
|
|
|
map.computeIfAbsent(SystemConstant.PAPAER_ATTACHMENT_IDS, v -> examTaskDetail.getPaperAttachmentIds());
|
|
|
map.computeIfAbsent(SystemConstant.APPROVE_OPERATION, v -> FlowApprovePassEnum.PASS);
|
|
|
activitiService.taskApprove(map);
|
|
|
@@ -1058,8 +1057,6 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
|
|
|
map.computeIfAbsent(SystemConstant.APPROVE_OPERATION, v -> FlowApprovePassEnum.CANCEL);
|
|
|
map.computeIfAbsent(SystemConstant.APPROVE_REMARK, v -> "命题" + FlowApprovePassEnum.CANCEL.getTitle());
|
|
|
map.computeIfAbsent(SystemConstant.APPROVE_SETUP, v -> FlowApproveSetupEnum.SUBMIT.getSetup());
|
|
|
-// map.computeIfAbsent(SystemConstant.APPROVE_CANCEL, v -> FlowApprovePassEnum.CANCEL);
|
|
|
-// map.computeIfAbsent(SystemConstant.APPROVE_CANCEL_USER, v -> SystemConstant.APPROVE_CANCEL_USER_ID);
|
|
|
activitiService.taskApprove(map);
|
|
|
return true;
|
|
|
}
|
|
|
@@ -1546,7 +1543,6 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
|
|
|
if (Objects.nonNull(task)) {
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
map.computeIfAbsent(SystemConstant.FLOW_TASK_ID, v -> task.getId());
|
|
|
-// map1.computeIfAbsent(SystemConstant.APPROVE_USER_IDS, v -> examTaskApplyParam.getApproveUserIds());
|
|
|
map.computeIfAbsent(SystemConstant.PAPAER_ATTACHMENT_IDS, v -> examTaskDetail.getPaperAttachmentIds());
|
|
|
map.computeIfAbsent(SystemConstant.APPROVE_OPERATION, v -> FlowApprovePassEnum.PASS);
|
|
|
activitiService.taskApprove(map);
|
|
|
@@ -1776,7 +1772,6 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
|
|
|
if (Objects.nonNull(task)) {
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
map.computeIfAbsent(SystemConstant.FLOW_TASK_ID, v -> task.getId());
|
|
|
-// map1.computeIfAbsent(SystemConstant.APPROVE_USER_IDS, v -> examTaskApplyTemp.getApproveUserIds());
|
|
|
map.computeIfAbsent(SystemConstant.APPROVE_OPERATION, v -> FlowApprovePassEnum.PASS);
|
|
|
map.computeIfAbsent(SystemConstant.PAPAER_ATTACHMENT_IDS, v -> examTaskDetail.getPaperAttachmentIds());
|
|
|
activitiService.taskApprove(map);
|
|
|
@@ -1835,32 +1830,6 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
|
|
|
final String link = ",";
|
|
|
List<ApprovalInfo> approvalInfoList = new ArrayList<>();
|
|
|
if (review) {
|
|
|
-// //TODO 主任和院长审核需修改
|
|
|
-// ApprovalInfo second = examTaskReviewLogService.findOnePassBySetUp(flowId, 2);
|
|
|
-// if (Objects.isNull(second)) {
|
|
|
-// throw ExceptionResultEnum.ERROR.exception("未找到主任级审核记录");
|
|
|
-// }
|
|
|
-// ApprovalInfo third = examTaskReviewLogService.findOnePassBySetUp(flowId, 3);
|
|
|
-// if (Objects.isNull(third)) {
|
|
|
-// throw ExceptionResultEnum.ERROR.exception("未找到院长级审核记录");
|
|
|
-// }
|
|
|
-// String secondRemark = second.getRemark();
|
|
|
-// if (SystemConstant.strNotNull(secondRemark)) {
|
|
|
-// secondRemark = remark + link + secondRemark;
|
|
|
-// } else {
|
|
|
-// secondRemark = remark;
|
|
|
-// }
|
|
|
-//
|
|
|
-// String thirdRemark = third.getRemark();
|
|
|
-// if (SystemConstant.strNotNull(thirdRemark)) {
|
|
|
-// thirdRemark = remark + link + thirdRemark;
|
|
|
-// } else {
|
|
|
-// thirdRemark = remark;
|
|
|
-// }
|
|
|
-// second.setRemark(secondRemark);
|
|
|
-// third.setRemark(thirdRemark);
|
|
|
-// approvalInfoList.add(second);
|
|
|
-// approvalInfoList.add(third);
|
|
|
approvalInfoList = tfFlowLogService.findApprovalInfoByFlowId(flowId);
|
|
|
}
|
|
|
|
|
|
@@ -1872,15 +1841,8 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
|
|
|
if (examPackageDetailDatasource.size() == 0) {
|
|
|
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);
|
|
|
|
|
|
-
|
|
|
// ---- 组装Dto
|
|
|
ExamTaskApprovalFormDto examTaskApprovalFormDto = new ExamTaskApprovalFormDto();
|
|
|
BasicInfo basicInfo = new BasicInfo();
|
|
|
@@ -1895,11 +1857,9 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
|
|
|
basicInfo.setExamEndTime(examObjectDto.getExamEndTime());
|
|
|
basicInfo.setCourseName(examTask.getCourseName());
|
|
|
|
|
|
-
|
|
|
examTaskApprovalFormDto.setBasicInfo(basicInfo);
|
|
|
examTaskApprovalFormDto.setExamRoomInfoList(examObjectDto.getExamRoomInfoList());
|
|
|
examTaskApprovalFormDto.setApprovalInfoList(approvalInfoList);
|
|
|
-
|
|
|
return examTaskApprovalFormDto;
|
|
|
}
|
|
|
|
|
|
@@ -1941,11 +1901,9 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
|
|
|
if (Objects.isNull(examTask)) {
|
|
|
throw ExceptionResultEnum.ERROR.exception("未找到命题任务");
|
|
|
}
|
|
|
-
|
|
|
List<ExamPackageDetail> examPackageDetailDatasource = this.baseMapper.findExamPackageDetailByPaperNumber(schoolId, examTask.getCourseCode(), paperNumber, null);
|
|
|
ExamObjectDto examObjectDto = this.buildExamObjectDtoByPackageDatasource(examPackageDetailDatasource);
|
|
|
|
|
|
-
|
|
|
examObjectDto.setPaperName(examTask.getPaperName());
|
|
|
examObjectDto.setPaperNumber(examTask.getPaperNumber());
|
|
|
return examObjectDto;
|
|
|
@@ -2070,7 +2028,6 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
|
|
|
packageCode = packageCodeList.get(0);
|
|
|
}
|
|
|
|
|
|
-
|
|
|
List<BackupMethodEnum> backupMethodEnums = examPackageDetailCell.stream().map(ExamPackageDetail::getBackupMethod).distinct().collect(Collectors.toList());
|
|
|
if (backupMethodEnums.size() != 1 && backupMethodEnums.get(0) != BackupMethodEnum.ROOM) {
|
|
|
throw ExceptionResultEnum.ERROR.exception("印刷计划试卷备份方式必须按考场");
|
wangliang