|
@@ -15,8 +15,8 @@ import com.qxgmat.data.dao.entity.Question;
|
|
|
import com.qxgmat.data.dao.entity.QuestionNo;
|
|
|
import com.qxgmat.data.dao.entity.UserCollectQuestion;
|
|
|
import com.qxgmat.data.dao.entity.UserNoteQuestion;
|
|
|
-import com.qxgmat.data.relation.UserNoteRelationMapper;
|
|
|
-import com.qxgmat.data.relation.entity.UserNoteRelation;
|
|
|
+import com.qxgmat.data.relation.UserNoteQuestionRelationMapper;
|
|
|
+import com.qxgmat.data.relation.entity.UserNoteQuestionRelation;
|
|
|
import com.qxgmat.service.inline.QuestionNoService;
|
|
|
import com.qxgmat.service.inline.QuestionService;
|
|
|
import org.slf4j.Logger;
|
|
@@ -36,7 +36,7 @@ public class UserNoteQuestionService extends AbstractService {
|
|
|
private UserNoteQuestionMapper userNoteQuestionMapper;
|
|
|
|
|
|
@Resource
|
|
|
- private UserNoteRelationMapper userNoteRelationMapper;
|
|
|
+ private UserNoteQuestionRelationMapper userNoteQuestionRelationMapper;
|
|
|
|
|
|
@Resource
|
|
|
private QuestionNoService questionNoService;
|
|
@@ -57,11 +57,11 @@ public class UserNoteQuestionService extends AbstractService {
|
|
|
* @param direction
|
|
|
* @return
|
|
|
*/
|
|
|
- public PageResult<UserNoteRelation> list(int page, int size, Integer userId, QuestionModule module, QuestionType type, String startTime, String endTime, String order, DirectionStatus direction){
|
|
|
+ public PageResult<UserNoteQuestionRelation> list(int page, int size, Integer userId, QuestionModule module, QuestionType type, String startTime, String endTime, String order, DirectionStatus direction){
|
|
|
String moduleKey = module == null ? null : module.key;
|
|
|
String typeKey = type == null ? null : type.key;
|
|
|
Page<UserNoteQuestion> p = page(()->{
|
|
|
- userNoteRelationMapper.list(userId, moduleKey, typeKey, startTime, endTime, order, direction.key);
|
|
|
+ userNoteQuestionRelationMapper.list(userId, moduleKey, typeKey, startTime, endTime, order, direction.key);
|
|
|
}, page, size);
|
|
|
|
|
|
Collection ids = Transform.getIds(p, UserNoteQuestion.class, "id");
|
|
@@ -69,17 +69,17 @@ public class UserNoteQuestionService extends AbstractService {
|
|
|
// 获取详细数据
|
|
|
List<UserNoteQuestion> list = select(ids);
|
|
|
|
|
|
- List<UserNoteRelation> pr = Transform.convert(list, UserNoteRelation.class);
|
|
|
+ List<UserNoteQuestionRelation> pr = Transform.convert(list, UserNoteQuestionRelation.class);
|
|
|
|
|
|
// 获取题目信息
|
|
|
- Collection questionIds = Transform.getIds(pr, UserNoteRelation.class, "questionId");
|
|
|
+ Collection questionIds = Transform.getIds(pr, UserNoteQuestionRelation.class, "questionId");
|
|
|
List<Question> questionList = questionService.select(questionIds);
|
|
|
- Transform.combine(pr, questionList, UserNoteRelation.class, "questionId", "question", Question.class, "id");
|
|
|
+ Transform.combine(pr, questionList, UserNoteQuestionRelation.class, "questionId", "question", Question.class, "id");
|
|
|
|
|
|
// 获取题目编号信息
|
|
|
- Collection questionNoIds = Transform.getIds(pr, UserNoteRelation.class, "questionNoId");
|
|
|
+ Collection questionNoIds = Transform.getIds(pr, UserNoteQuestionRelation.class, "questionNoId");
|
|
|
List<QuestionNo> questionNoList = questionNoService.select(questionNoIds);
|
|
|
- Transform.combine(pr, questionNoList, UserNoteRelation.class, "questionNoId", "questionNo", Question.class, "id");
|
|
|
+ Transform.combine(pr, questionNoList, UserNoteQuestionRelation.class, "questionNoId", "questionNo", Question.class, "id");
|
|
|
|
|
|
return new PageResult<>(pr, p.getTotal());
|
|
|
}
|