|
@@ -109,6 +109,7 @@ public class ExamSimulateServiceImpl extends ServiceImpl<ExamSimulateMapper, Exa
|
|
|
qk1Bo.setKnum(simulateConfig.getSingleChoice().getKnum());
|
|
|
qk1Bo.setRandomNum(simulateConfig.getType());
|
|
|
qk1Bo.setType(1);
|
|
|
+ qk1Bo.setOrderGoodsId(bo.getOrderGoodsId());
|
|
|
qk1Bo.setFromType(bo.getFrom());
|
|
|
List<Long> qk1 = baseMapper.getKnowledQuestionList(qk1Bo);
|
|
|
|
|
@@ -118,6 +119,7 @@ public class ExamSimulateServiceImpl extends ServiceImpl<ExamSimulateMapper, Exa
|
|
|
qk2Bo.setKnum(simulateConfig.getMultipleChoice().getKnum());
|
|
|
qk2Bo.setRandomNum(simulateConfig.getType());
|
|
|
qk2Bo.setType(2);
|
|
|
+ qk2Bo.setOrderGoodsId(bo.getOrderGoodsId());
|
|
|
qk2Bo.setFromType(bo.getFrom());
|
|
|
List<Long> qk2 = baseMapper.getKnowledQuestionList(qk2Bo);
|
|
|
|
|
@@ -127,6 +129,7 @@ public class ExamSimulateServiceImpl extends ServiceImpl<ExamSimulateMapper, Exa
|
|
|
qk3Bo.setKnum(simulateConfig.getCaseQuestion().getKnum());
|
|
|
qk3Bo.setRandomNum(simulateConfig.getType());
|
|
|
qk3Bo.setType(4);
|
|
|
+ qk3Bo.setOrderGoodsId(bo.getOrderGoodsId());
|
|
|
qk3Bo.setFromType(bo.getFrom());
|
|
|
List<Long> qk3 = baseMapper.getKnowledQuestionList(qk3Bo);
|
|
|
|
|
@@ -136,6 +139,7 @@ public class ExamSimulateServiceImpl extends ServiceImpl<ExamSimulateMapper, Exa
|
|
|
q1Bo.setQnum(simulateConfig.getSingleChoice().getQnum()-qk1.size());
|
|
|
q1Bo.setRandomNum(simulateConfig.getType());
|
|
|
q1Bo.setType(1);
|
|
|
+ q1Bo.setOrderGoodsId(bo.getOrderGoodsId());
|
|
|
q1Bo.setFromType(bo.getFrom());
|
|
|
List<Long> q1 = baseMapper.getQuestionList(q1Bo);
|
|
|
|
|
@@ -145,6 +149,7 @@ public class ExamSimulateServiceImpl extends ServiceImpl<ExamSimulateMapper, Exa
|
|
|
q2Bo.setQnum(simulateConfig.getMultipleChoice().getQnum()-qk2.size());
|
|
|
q2Bo.setRandomNum(simulateConfig.getType());
|
|
|
q2Bo.setType(2);
|
|
|
+ q2Bo.setOrderGoodsId(bo.getOrderGoodsId());
|
|
|
q2Bo.setFromType(bo.getFrom());
|
|
|
List<Long> q2 = baseMapper.getQuestionList(q2Bo);
|
|
|
|
|
@@ -154,6 +159,7 @@ public class ExamSimulateServiceImpl extends ServiceImpl<ExamSimulateMapper, Exa
|
|
|
q3Bo.setQnum(simulateConfig.getCaseQuestion().getQnum()-qk3.size());
|
|
|
q3Bo.setRandomNum(simulateConfig.getType());
|
|
|
q3Bo.setType(4);
|
|
|
+ q3Bo.setOrderGoodsId(bo.getOrderGoodsId());
|
|
|
q3Bo.setFromType(bo.getFrom());
|
|
|
List<Long> q3 = baseMapper.getQuestionList(q3Bo);
|
|
|
|