|
@@ -49,11 +49,14 @@ public class WmQuizItemServiceImpl extends ServiceImpl<WmQuizItemMapper, WmQuizI
|
|
*
|
|
*
|
|
* @param resource 试卷项信息
|
|
* @param resource 试卷项信息
|
|
* @param user 操作人
|
|
* @param user 操作人
|
|
- * @return 创建结果
|
|
|
|
|
|
+ * @return 试卷项
|
|
*/
|
|
*/
|
|
@Override
|
|
@Override
|
|
- public Boolean createItem(WmQuizDTO.OnItemCreate resource, HnqzUser user) {
|
|
|
|
- return this.createItems(Collections.singletonList(resource), user);
|
|
|
|
|
|
+ public WmQuizItem createItem(WmQuizDTO.OnItemCreate resource, HnqzUser user) {
|
|
|
|
+ List<WmQuizItem> quizItems = this.createItems(Collections.singletonList(resource), user);
|
|
|
|
+
|
|
|
|
+ return CollUtil.isEmpty(quizItems) ? null : quizItems.get(0);
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -61,11 +64,11 @@ public class WmQuizItemServiceImpl extends ServiceImpl<WmQuizItemMapper, WmQuizI
|
|
*
|
|
*
|
|
* @param resources 试卷项集合
|
|
* @param resources 试卷项集合
|
|
* @param user 操作人
|
|
* @param user 操作人
|
|
- * @return 创建结果
|
|
|
|
|
|
+ * @return 试卷项列表
|
|
*/
|
|
*/
|
|
@Override
|
|
@Override
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
- public Boolean createItems(List<WmQuizDTO.OnItemCreate> resources, HnqzUser user) {
|
|
|
|
|
|
+ public List<WmQuizItem> createItems(List<WmQuizDTO.OnItemCreate> resources, HnqzUser user) {
|
|
|
|
|
|
List<WmQuizItem> quizItems = resources.stream().map(item -> {
|
|
List<WmQuizItem> quizItems = resources.stream().map(item -> {
|
|
WmQuizItem quizItem = new WmQuizItem();
|
|
WmQuizItem quizItem = new WmQuizItem();
|
|
@@ -88,8 +91,8 @@ public class WmQuizItemServiceImpl extends ServiceImpl<WmQuizItemMapper, WmQuizI
|
|
return quizItem;
|
|
return quizItem;
|
|
}).collect(Collectors.toList());
|
|
}).collect(Collectors.toList());
|
|
|
|
|
|
-
|
|
|
|
- return this.saveBatch(quizItems);
|
|
|
|
|
|
+ boolean saved = this.saveBatch(quizItems);
|
|
|
|
+ return saved ? quizItems : Collections.emptyList();
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -124,7 +127,7 @@ public class WmQuizItemServiceImpl extends ServiceImpl<WmQuizItemMapper, WmQuizI
|
|
quizItem.setWidget(resource.getWidget());
|
|
quizItem.setWidget(resource.getWidget());
|
|
}
|
|
}
|
|
|
|
|
|
- if (resource.getMark() != null){
|
|
|
|
|
|
+ if (resource.getMark() != null) {
|
|
quizItem.setMark(resource.getMark());
|
|
quizItem.setMark(resource.getMark());
|
|
}
|
|
}
|
|
|
|
|