广药子流程update 撤销和暂存

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

@@ -951,9 +951,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
     @Override
     public boolean saveExamTaskDetail(ExamTaskDetail examTaskDetail) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        if (examTaskDetail.getExamTaskId() == null) {
-            throw ExceptionResultEnum.ERROR.exception("命题任务ID不能为空");
-        }
+        Optional.ofNullable(examTaskDetail.getExamTaskId()).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("命题任务ID不能为空"));
         if (StringUtils.isBlank(examTaskDetail.getOperateType())) {
             throw ExceptionResultEnum.ERROR.exception("命题任务提交类型不能为空");
         }
@@ -970,38 +968,13 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             // 审核一级
             Task task = taskService.createTaskQuery().processInstanceId(String.valueOf(examTask.getFlowId())).singleResult();
             if (Objects.nonNull(task)) {
-                Map<String, Object> map1 = new HashMap<>();
-                map1.computeIfAbsent(SystemConstant.FLOW_TASK_ID, v -> task.getId());
-                map1.computeIfAbsent(SystemConstant.APPROVE_USER_IDS, v -> examTaskDetail.getApproveUserIds());
-                map1.computeIfAbsent(SystemConstant.PAPAER_ATTACHMENT_IDS, v -> examTaskDetail.getPaperAttachmentIds());
-                activitiService.taskApprove(map1);
-            }
-        }
-//        else if(ExamStatusEnum.STAGE.name().equals(examTaskDetail.getOperateType())){
-//            Map<String, Object> map = new HashMap<>();
-//            map.computeIfAbsent(SystemConstant.APPROVE_ID, v -> String.valueOf(examTask.getUserId()));
-//            map.computeIfAbsent(SystemConstant.TEACHING_ROOM_ID, v -> examTask.getTeachingRoomId());
-//            ProcessInstance processInstance = activitiService.flowStart(map);
-//            examTask.setFlowId(SystemConstant.convertIdToLong(processInstance.getId()));
-//
-//            List<TExamTaskFlow> tExamTaskFlowList = tExamTaskFlowService.findByExamTaskId(examTask.getId());
-//            tExamTaskFlowService.removeByIds(tExamTaskFlowList.stream().map(s -> s.getId()).collect(Collectors.toList()));
-//
-//            Map<String, Object> map2 = new HashMap<>();
-//            map2.computeIfAbsent(SystemConstant.EXAM_TASK_ID, v -> examTask.getId());
-//            map2.computeIfAbsent(SystemConstant.FLOW_ID, v -> examTask.getFlowId());
-//            tExamTaskFlowService.saveOrUpdate(map2);
-
-        //TODO 撤销问题
-//            Task task = taskService.createTaskQuery().processInstanceId(String.valueOf(examTask.getFlowId())).singleResult();
-//            if (Objects.nonNull(task)) {
-//                Map<String, Object> map1 = new HashMap<>();
-//                map1.computeIfAbsent(SystemConstant.FLOW_TASK_ID, v -> task.getId());
-//                map1.computeIfAbsent(SystemConstant.APPROVE_USER_IDS, v -> examTaskDetail.getApproveUserIds());
-//                map1.computeIfAbsent(SystemConstant.PAPAER_ATTACHMENT_IDS, v -> examTaskDetail.getPaperAttachmentIds());
-//                activitiService.taskApprove(map1);
-//            }
-//        }
+                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());
+                activitiService.taskApprove(map);
+            }
+        }
 
         UpdateWrapper<ExamTask> updateWrapper = new UpdateWrapper<>();
         updateWrapper.lambda()
@@ -1038,74 +1011,35 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         }
         examTaskDetail.setUpdateId(sysUser.getId());
         examTaskDetail.setUpdateTime(System.currentTimeMillis());
-
         return examTaskDetailService.saveOrUpdate(examTaskDetail);
     }
 
     @Override
     @Transactional
     public boolean status(ExamTask examTask) {
-        if (examTask.getId() == null) {
-            throw ExceptionResultEnum.ERROR.exception("参数有误");
-        }
+        Optional.ofNullable(examTask.getId()).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("参数有误"));
         ExamTask task = this.getById(examTask.getId());
         if (!task.getReview()) {
             throw ExceptionResultEnum.ERROR.exception("命题任务不需要审核，不能撤回");
         }
-        if (Objects.isNull(task.getFlowId())) {
-            throw ExceptionResultEnum.ERROR.exception("审核流程有误，不能撤回");
-        }
+        Optional.ofNullable(task.getFlowId()).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("审核流程有误，不能撤回"));
 
         TFFlowApprove tfFlowApprove = tfFlowApproveService.findByFlowId(task.getFlowId(), task.getSchoolId());
-        if (Objects.isNull(tfFlowApprove)) {
-            throw ExceptionResultEnum.ERROR.exception("审核流程进度丢失，不能撤回");
-        }
+        Optional.ofNullable(tfFlowApprove).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("审核流程进度丢失，不能撤回"));
 
         if (!tfFlowApprove.getSetup().equals(FlowApproveSetupEnum.PRIMARY_APPROVE.getSetup())) {
             throw ExceptionResultEnum.ERROR.exception("当前审核节点不能撤回");
         }
 
-//        Map<String, Object> map = new HashMap<>();
-//        map.computeIfAbsent(SystemConstant.APPROVE_ID, v -> String.valueOf(task.getUserId()));
-//        map.computeIfAbsent(SystemConstant.TEACHING_ROOM_ID, v -> task.getTeachingRoomId());
-//        ProcessInstance processInstance = activitiService.flowStart(map);
-
-//        tfFlowApproveService.removeById(tfFlowApprove);
-//
-//        TFFlowApproveLog tfFlowApproveLog = tfFlowApproveLogService.findByFlowId(task.getFlowId());
-//        if (Objects.nonNull(tfFlowApproveLog)) {
-//            tfFlowApproveLogService.removeById(tfFlowApproveLog);
-//        }
-//
-//        List<TFFlowLog> tfFlowLogList = tfFlowLogService.findByFlowId(task.getFlowId());
-//        if (Objects.nonNull(tfFlowLogList) && tfFlowLogList.size() > 0) {
-//            tfFlowLogService.removeByIds(tfFlowLogList.stream().map(s -> s.getId()).collect(Collectors.toList()));
-//        }
-//
-//        TExamTaskFlow tExamTaskFlow = tExamTaskFlowService.findByFlowLevel(task.getId());
-//        tExamTaskFlowService.removeById(tExamTaskFlow);
-
-//        UpdateWrapper<ExamTask> updateWrapper = new UpdateWrapper<>();
-//        updateWrapper.lambda().set(ExamTask::getStatus, ExamStatusEnum.STAGE)
-//                .set(ExamTask::getFlowId, null)
-//                .eq(ExamTask::getId, examTask.getId());
-//        this.update(updateWrapper);
-
         Task flowTask = taskService.createTaskQuery().processInstanceId(String.valueOf(task.getFlowId())).singleResult();
         Map<String, Object> map = new HashMap<>();
         map.computeIfAbsent(SystemConstant.FLOW_TASK_ID, v -> flowTask.getId());
         map.computeIfAbsent(SystemConstant.APPROVE_OPERATION, v -> FlowApprovePassEnum.REJECT);
-        map.computeIfAbsent(SystemConstant.APPROVE_REMARK, v -> FlowApprovePassEnum.CANCEL.getTitle());
+        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);
-//        activitiService.flowEnd(String.valueOf(task.getFlowId()));
-
-//        Map<String, Object> map2 = new HashMap<>();
-//        map2.computeIfAbsent(SystemConstant.EXAM_TASK_ID, v -> examTask.getId());
-//        map2.computeIfAbsent(SystemConstant.FLOW_ID, v -> Long.parseLong(processInstance.getId()));
-//        tExamTaskFlowService.saveOrUpdate(map2);
         return true;
     }