|
@@ -1359,19 +1359,16 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
|
|
examTask.setCreateId(sysUser.getId());
|
|
examTask.setCreateId(sysUser.getId());
|
|
examTask.setReview(basicExamRule.getReview());
|
|
examTask.setReview(basicExamRule.getReview());
|
|
examTask.setUserId(sysUser.getId());
|
|
examTask.setUserId(sysUser.getId());
|
|
- if (examTask.getUserId() == null || !ExamStatusEnum.SUBMIT.name().equals(examTaskDetail.getOperateType())) {
|
|
|
|
- examTask.setStatus(ExamStatusEnum.DRAFT);
|
|
|
|
- } else {
|
|
|
|
- if (Objects.isNull(examTask.getFlowId())) {
|
|
|
|
- //TODO 这里以后要判断学校code来取流程key
|
|
|
|
- examTask.setStatus(ExamStatusEnum.STAGE);
|
|
|
|
- if (basicExamRule.getReview()) {
|
|
|
|
- Map<String, Object> map = new HashMap<>();
|
|
|
|
- map.computeIfAbsent(SystemConstant.APPROVE_ID, v -> String.valueOf(examTask.getUserId()));
|
|
|
|
- ProcessInstance processInstance = activitiService.startActivity(SystemConstant.GDYKDX_FLOW_KEY, map);
|
|
|
|
- examTask.setFlowId(Long.parseLong(processInstance.getId()));
|
|
|
|
|
|
|
|
- }
|
|
|
|
|
|
+ examTask.setStatus(ExamStatusEnum.valueOf(examTaskDetail.getOperateType()));
|
|
|
|
+ if (Objects.isNull(examTask.getFlowId())) {
|
|
|
|
+ //TODO 这里以后要判断学校code来取流程key
|
|
|
|
+ if (basicExamRule.getReview()) {
|
|
|
|
+ Map<String, Object> map = new HashMap<>();
|
|
|
|
+ map.computeIfAbsent(SystemConstant.APPROVE_ID, v -> String.valueOf(examTask.getUserId()));
|
|
|
|
+ ProcessInstance processInstance = activitiService.startActivity(SystemConstant.GDYKDX_FLOW_KEY, map);
|
|
|
|
+ examTask.setFlowId(Long.parseLong(processInstance.getId()));
|
|
|
|
+
|
|
}
|
|
}
|
|
}
|
|
}
|
|
this.saveOrUpdate(examTask);
|
|
this.saveOrUpdate(examTask);
|