joylink/rt-sim-training-service
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 10 Wiki Activity

Merge remote-tracking branch 'origin/test-training2' into test-training2

Browse Source
This commit is contained in:
tiger_zhou 2022-10-20 09:54:07 +08:00
commit f9b02894e0
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/club/joylink/rtss/services/paper/PaperUserCreateService.java
View File

@ -64,7 +64,9 @@ public class PaperUserCreateService {
PaperExceptionAssert.PcExisted.assertNotNull(composition, "创建试卷的试卷定义不存在，pcId = " + pcId); PaperExceptionAssert.PcExisted.assertNotNull(composition, "创建试卷的试卷定义不存在，pcId = " + pcId);
PaperExceptionAssert.PcCanCreatePu.assertTrue(!PaperCompositionState.Editing.equals(PaperCompositionState.getItem(composition.getState())), "编辑中的试卷定义无法用于生成用户试卷，pcId = " + pcId); PaperExceptionAssert.PcCanCreatePu.assertTrue(!PaperCompositionState.Editing.equals(PaperCompositionState.getItem(composition.getState())), "编辑中的试卷定义无法用于生成用户试卷，pcId = " + pcId);
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
if (null != composition.getStartTime() && null != composition.getEndTime()) {
PaperExceptionAssert.PcCanCreatePu.assertTrue(now.isAfter(composition.getStartTime()) && now.isBefore(composition.getEndTime()), "当前时间未在试卷启用时间内，不能创建试卷"); PaperExceptionAssert.PcCanCreatePu.assertTrue(now.isAfter(composition.getStartTime()) && now.isBefore(composition.getEndTime()), "当前时间未在试卷启用时间内，不能创建试卷");
}
// 试卷蓝图规则 // 试卷蓝图规则
List<PaperRule> ruleList = compositionService.findRuleByPcId(pcId); List<PaperRule> ruleList = compositionService.findRuleByPcId(pcId);
PaperExceptionAssert.PcHavePr.assertCollectionNotEmpty(ruleList, "试卷定义没有规则定义，无法生成用户试卷，pcId = " + pcId); PaperExceptionAssert.PcHavePr.assertCollectionNotEmpty(ruleList, "试卷定义没有规则定义，无法生成用户试卷，pcId = " + pcId);