From 5d9106f6c72144286c1edd29912bcc1829fae22d Mon Sep 17 00:00:00 2001 From: hujunpeng Date: Fri, 14 Mar 2025 17:13:11 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=98=E5=BA=93=E7=AE=A1=E7=90=86=E5=92=8C?= =?UTF-8?q?=E8=AF=95=E5=8D=B7=E7=AE=A1=E7=90=86=E4=BB=A3=E7=A0=81=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ccic/safeliab/dao/ExamPaperMapper.java | 26 ++-- .../safeliab/dao/PaperQuestionMapper.java | 2 +- .../safeliab/service/ExamPaperService.java | 67 ++++----- .../service/ExamPaperServiceImpl.java | 101 +++++++------- .../service/PaperQuestionService.java | 25 ++-- .../service/PaperQuestionServiceImpl.java | 45 +++--- .../safeliab/service/QuestionServiceImpl.java | 23 +-- .../com/ccic/safeliab/vo/InsExamPaperVO.java | 25 +++- .../com/ccic/safeliab/vo/InsQuestionVO.java | 36 +++-- .../safeliab/web/ExamPaperController.java | 106 +++++++------- .../ccic/safeliab/web/QuestionController.java | 1 + .../resources/mappers/ExamPaperMapper.xml | 132 ++++++++++-------- .../resources/mappers/PaperQuestionMapper.xml | 2 +- .../main/resources/mappers/QuestionMapper.xml | 21 ++- 14 files changed, 331 insertions(+), 281 deletions(-) diff --git a/ccic-exam/src/main/java/com/ccic/safeliab/dao/ExamPaperMapper.java b/ccic-exam/src/main/java/com/ccic/safeliab/dao/ExamPaperMapper.java index 3d5424f..228190f 100644 --- a/ccic-exam/src/main/java/com/ccic/safeliab/dao/ExamPaperMapper.java +++ b/ccic-exam/src/main/java/com/ccic/safeliab/dao/ExamPaperMapper.java @@ -17,12 +17,12 @@ import java.util.List; public interface ExamPaperMapper extends BaseMapper { /** - * 查询当前页数据 + * 查询试卷 * - * @param industryId 监管行业 - * @param paperName 试卷名称 - * @param offset 偏移量 - * @param num 每页显示的记录数 + * @param industryId 监管行业 + * @param paperName 试卷名称 + * @param offset 偏移量 + * @param num 每页数量 * @return 当前页数据 */ List getList( @@ -32,11 +32,11 @@ public interface ExamPaperMapper extends BaseMapper { @Param("num") int num); /** - * 查询总数量 + * 查询试卷数量 * - * @param industryId 监管行业 - * @param paperName 试卷名称 - * @return 总数量 + * @param industryId 监管行业 + * @param paperName 试卷名称 + * @return 试卷数量 */ int getListSize( @Param("industryId") Long industryId, @@ -45,10 +45,10 @@ public interface ExamPaperMapper extends BaseMapper { /** * 试卷详情 * - * @param id ID + * @param id 试卷ID * @return 试卷详情 */ - ExamPapers getDetail(@Param("id") Long id); + ExamPapers getExamPaperDetail(@Param("id") Long id); /** * 试卷详情(试题) @@ -59,11 +59,11 @@ public interface ExamPaperMapper extends BaseMapper { List getQuestions(@Param("id") Long id); /** - * 随机获取题目 + * 随机获取试题 * * @param industryId 监管行业 * @param questionCount 题目数量 - * @return 题目列表 + * @return 题目 */ List getRandomQuestions( @Param("industryId") Long industryId, diff --git a/ccic-exam/src/main/java/com/ccic/safeliab/dao/PaperQuestionMapper.java b/ccic-exam/src/main/java/com/ccic/safeliab/dao/PaperQuestionMapper.java index d8079d2..4880f91 100644 --- a/ccic-exam/src/main/java/com/ccic/safeliab/dao/PaperQuestionMapper.java +++ b/ccic-exam/src/main/java/com/ccic/safeliab/dao/PaperQuestionMapper.java @@ -17,7 +17,7 @@ public interface PaperQuestionMapper extends BaseMapper { * 删除试卷的所有试题 * * @param id 试卷id - * @return 删除件数 + * @return 删除结果 */ boolean deletePaperALlQuestion(@Param("id") Long id); diff --git a/ccic-exam/src/main/java/com/ccic/safeliab/service/ExamPaperService.java b/ccic-exam/src/main/java/com/ccic/safeliab/service/ExamPaperService.java index cf11f25..127772c 100644 --- a/ccic-exam/src/main/java/com/ccic/safeliab/service/ExamPaperService.java +++ b/ccic-exam/src/main/java/com/ccic/safeliab/service/ExamPaperService.java @@ -11,69 +11,62 @@ import java.util.Map; @Service public interface ExamPaperService extends BaseService { + /** * 获取试卷列表 - * @param page 页码 - * @param num 每页数量 + * + * @param page 页码 + * @param num 每页数量 * @param entity 试卷表 * @return 试卷列表 */ Map getList(int page, int num, ExamPapers entity); - - /** - * 根据主键删除试卷记录 - * @param id 试卷记录的主键 - * @return 删除操作是否成功 - */ - boolean deleteExamPaperById(Long id); - /** - * 根据主键批量删除试卷记录 - * @param ids 试卷记录的主键列表 - * @return 删除操作是否成功 + * 删除试卷 + * + * @param ids 试卷ID + * @return 删除结果 */ - boolean deleteExamPaperListByIds(List ids); + boolean delExamPaper(List ids); /** * 更新试卷状态 - * @param vo 试题 VO 列表 - * @return 添加是否成功 + * + * @param vo 试卷vo + * @return 更新结果 */ - boolean updatePaperStatus(InsExamPaperVO vo); + boolean upPaperStatus(InsExamPaperVO vo); /** - * 批量更新试卷状态 - * @param vos 试卷记录的主键列表 - * @return 删除操作是否成功 + * 获取试卷详情 + * + * @param id 试卷ID + * @return 试卷详情 */ - boolean batchUpdatePaperStatus(List vos); + Map getExamPaperDetail(String id); /** - * 获取试卷列表 - * @param id 题目ID - * @return 题目详情 - */ - Map getDetail(String id); - - /** - * 随机获取题目 + * 随机获取试题 + * * @param entity 试卷表 - * @return 试卷列表 + * @return 试题 */ List getRandomQuestions(ExamPapers entity); /** * 添加试卷 + * * @param vo 试卷 - * @return 添加是否成功 + * @return 添加结果 */ - ExamPapers add(InsExamPaperVO vo); + boolean addExamPaper(InsExamPaperVO vo); /** - * 修改试题 - * @param vo 试题 VO 列表 - * @return 添加是否成功 + * 修改试卷 + * + * @param vo 试卷 + * @return 修改结果 */ - ExamPapers update(InsExamPaperVO vo); -} + boolean editExamPaper(InsExamPaperVO vo); +} \ No newline at end of file diff --git a/ccic-exam/src/main/java/com/ccic/safeliab/service/ExamPaperServiceImpl.java b/ccic-exam/src/main/java/com/ccic/safeliab/service/ExamPaperServiceImpl.java index a35ba51..39d03c5 100644 --- a/ccic-exam/src/main/java/com/ccic/safeliab/service/ExamPaperServiceImpl.java +++ b/ccic-exam/src/main/java/com/ccic/safeliab/service/ExamPaperServiceImpl.java @@ -8,7 +8,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -21,44 +20,36 @@ public class ExamPaperServiceImpl extends BaseServiceImpl getList(int page,int num, ExamPapers entity) { + public Map getList(int page, int num, ExamPapers entity) { int offset = (page - 1) * num; Map map = new HashMap<>(); + List data = baseMapper.getList( entity.getIndustryId(), entity.getPaperName(), offset, - num); + num + ); - int total = baseMapper.getListSize( + int total = baseMapper.getListSize( entity.getIndustryId(), - entity.getPaperName()); + entity.getPaperName() + ); + map.put("data", data); map.put("total", total); return map; } @Override - public boolean deleteExamPaperById(Long id) { + public boolean delExamPaper(List ids) { boolean flag = false; - List ids = new ArrayList<>(); - ids.add(id); flag = deleteLogic(ids); - if(flag){ - flag = paperQuestionService.delete(id); - } - return flag; - } - - @Override - public boolean deleteExamPaperListByIds(List ids) { - boolean flag = false; - flag = deleteLogic(ids); - if(flag){ - for(Long id : ids){ + if (flag) { + for (Long id : ids) { flag = paperQuestionService.delete(id); - if(!flag){ + if (!flag) { break; } } @@ -67,61 +58,66 @@ public class ExamPaperServiceImpl extends BaseServiceImpl vos) { + public boolean upPaperStatus(InsExamPaperVO vo) { boolean flag = false; - for(InsExamPaperVO vo : vos){ - flag = updatePaperStatus(vo); + for (Long id : vo.getIds()) { + ExamPapers entity = baseMapper.getExamPaperDetail(id); + entity.setPaperStatus(vo.getPaperStatus()); + flag = updateById(entity); + if (!flag) { + break; + } } return flag; } @Override - public Map getDetail(String id){ + public Map getExamPaperDetail(String id) { Map map = new HashMap<>(); - ExamPapers head = baseMapper.getDetail(Long.valueOf(id)); + ExamPapers head = baseMapper.getExamPaperDetail(Long.valueOf(id)); List detail = baseMapper.getQuestions(Long.valueOf(id)); + map.put("head", head); map.put("data", detail); return map; } @Override - public List getRandomQuestions(ExamPapers entity) { + public List getRandomQuestions(ExamPapers entity) { return baseMapper.getRandomQuestions(entity.getIndustryId(), entity.getQuestionCount()); } @Override - public ExamPapers add(InsExamPaperVO vo){ + public boolean addExamPaper(InsExamPaperVO vo) { // 试卷 - ExamPapers examPapers = new ExamPapers(); - examPapers.setPaperName(vo.getPaperName()); - examPapers.setIndustryId(vo.getIndustryId()); - examPapers.setQuestionCount(vo.getQuestionCount()); - examPapers.setTotalScore(vo.getTotalScore()); - examPapers.setExamDuration(vo.getExamDuration()); - examPapers.setDurationType(vo.getDurationType()); - examPapers.setPaperContent(vo.getPaperContent()); + boolean flag = false; + ExamPapers examPapers = voToEntity(vo); examPapers.setPaperStatus(1); - save(examPapers); - return examPapers; + flag = save(examPapers); + + if (flag) { + flag = paperQuestionService.addPaperQuestion(examPapers.getId(), vo.getQuestionIds()); + } + return flag; } @Override - public ExamPapers update(InsExamPaperVO vo) { + public boolean editExamPaper(InsExamPaperVO vo) { // 试卷 - ExamPapers examPapers = new ExamPapers(); + boolean flag = false; + ExamPapers examPapers = voToEntity(vo); examPapers.setId(vo.getId()); + flag = updateById(examPapers); + + if (flag) { + flag = paperQuestionService.editPaperQuestion(examPapers.getId(), vo.getQuestionIds()); + } + return flag; + } + + // vo转entity + private ExamPapers voToEntity(InsExamPaperVO vo) { + ExamPapers examPapers = new ExamPapers(); examPapers.setPaperName(vo.getPaperName()); examPapers.setIndustryId(vo.getIndustryId()); examPapers.setQuestionCount(vo.getQuestionCount()); @@ -129,7 +125,6 @@ public class ExamPaperServiceImpl extends BaseServiceImpl { /** * 添加试卷试题关系 - * @param paperID 试卷ID - * @param QuestionIds 题目ID集合 - * @return 添加是否成功 + * + * @param paperID 试卷ID + * @param questionIds 题目ID集合 + * @return 添加结果 */ - int add(Long paperID, List QuestionIds); + boolean addPaperQuestion(Long paperID, List questionIds); /** * 删除试卷试题关系 + * * @param paperID 试卷ID - * @return 添加是否成功 + * @return 删除是否成功 */ boolean delete(Long paperID); /** - * 更新试卷试题关系 - * @param paperID 试卷ID - * @param QuestionIds 题目ID集合 - * @return 添加是否成功 + * 修改试卷试题关系 + * + * @param paperID 试卷ID + * @param questionIds 题目ID集合 + * @return 修改结果 */ - int update(Long paperID, List QuestionIds); -} + boolean editPaperQuestion(Long paperID, List questionIds); +} \ No newline at end of file diff --git a/ccic-exam/src/main/java/com/ccic/safeliab/service/PaperQuestionServiceImpl.java b/ccic-exam/src/main/java/com/ccic/safeliab/service/PaperQuestionServiceImpl.java index c236332..82de1fa 100644 --- a/ccic-exam/src/main/java/com/ccic/safeliab/service/PaperQuestionServiceImpl.java +++ b/ccic-exam/src/main/java/com/ccic/safeliab/service/PaperQuestionServiceImpl.java @@ -13,39 +13,40 @@ import java.util.List; public class PaperQuestionServiceImpl extends BaseServiceImpl implements PaperQuestionService { @Override - public int add(Long paperID, List QuestionIds){ - int number = 0; - for(String QuestionId : QuestionIds){ - number++; - PaperQuestion paperQuestion = new PaperQuestion(); - paperQuestion.setPaperId(paperID); - paperQuestion.setQuestionId(Long.valueOf(QuestionId)); - paperQuestion.setQuestionNumber(number); - save(paperQuestion); - - } - - return number; + public boolean addPaperQuestion(Long paperID, List questionIds) { + return addPaperQuestions(paperID, questionIds); } @Override - public boolean delete(Long paperID){ + public boolean delete(Long paperID) { return baseMapper.deletePaperALlQuestion(paperID); } @Override - public int update(Long paperID, List QuestionIds){ - baseMapper.deletePaperALlQuestion(paperID); + public boolean editPaperQuestion(Long paperID, List questionIds) { + boolean flag = false; + flag = baseMapper.deletePaperALlQuestion(paperID); + if (!flag) { + return false; + } + return addPaperQuestions(paperID, questionIds); + } + + // 添加试卷试题关联 + private boolean addPaperQuestions(Long paperID, List questionIds) { + boolean flag = false; int number = 0; - for(String QuestionId : QuestionIds){ + for (String questionId : questionIds) { number++; PaperQuestion paperQuestion = new PaperQuestion(); paperQuestion.setPaperId(paperID); - paperQuestion.setQuestionId(Long.valueOf(QuestionId)); + paperQuestion.setQuestionId(Long.valueOf(questionId)); paperQuestion.setQuestionNumber(number); - save(paperQuestion); - + flag = save(paperQuestion); + if (!flag) { + return flag; + } } - return number; + return flag; } -} +} \ No newline at end of file diff --git a/ccic-exam/src/main/java/com/ccic/safeliab/service/QuestionServiceImpl.java b/ccic-exam/src/main/java/com/ccic/safeliab/service/QuestionServiceImpl.java index 68af13a..7b5b872 100644 --- a/ccic-exam/src/main/java/com/ccic/safeliab/service/QuestionServiceImpl.java +++ b/ccic-exam/src/main/java/com/ccic/safeliab/service/QuestionServiceImpl.java @@ -47,17 +47,19 @@ public class QuestionServiceImpl extends BaseServiceImpl vo) { - int count = 0; + boolean flag = false; for (InsQuestionVO item : vo) { - save(convertToEntity(item)); - count++; + flag = save(voToEntity(item)); + if (!flag) { + return false; + } } - return count > 0; + return flag; } @Override public boolean editQuestion(InsQuestionVO vo) { - return updateById(convertToEntity(vo)); + return updateById(voToEntity(vo)); } @Override @@ -73,7 +75,7 @@ public class QuestionServiceImpl extends BaseServiceImpl questionIds; -} + /** + * 试卷ID + */ + private List ids; + /** + * 试题ID + */ + private List questionIds; +} \ No newline at end of file diff --git a/ccic-exam/src/main/java/com/ccic/safeliab/vo/InsQuestionVO.java b/ccic-exam/src/main/java/com/ccic/safeliab/vo/InsQuestionVO.java index 4f04113..0b17c34 100644 --- a/ccic-exam/src/main/java/com/ccic/safeliab/vo/InsQuestionVO.java +++ b/ccic-exam/src/main/java/com/ccic/safeliab/vo/InsQuestionVO.java @@ -5,23 +5,39 @@ import lombok.Getter; import lombok.Setter; /** - * vo 试题vo + * 试题vo */ @Getter @Setter public class InsQuestionVO extends QuestionCategories { - // 每页数量 + + /** + * 每页数量 + */ private int num; - // 页码 + + /** + * 页码 + */ private int page; - // 答案A + + /** + * 答案A + */ public String optionA; - // 答案B + + /** + * 答案B + */ public String optionB; - // 答案C - public String optionC; - // 答案D - public String optionD; -} + /** + * 答案C + */ + public String optionC; + /** + * 答案D + */ + public String optionD; +} \ No newline at end of file diff --git a/ccic-exam/src/main/java/com/ccic/safeliab/web/ExamPaperController.java b/ccic-exam/src/main/java/com/ccic/safeliab/web/ExamPaperController.java index f6e5ec3..5e99935 100644 --- a/ccic-exam/src/main/java/com/ccic/safeliab/web/ExamPaperController.java +++ b/ccic-exam/src/main/java/com/ccic/safeliab/web/ExamPaperController.java @@ -3,7 +3,6 @@ package com.ccic.safeliab.web; import com.ccic.safeliab.entity.ExamPapers; import com.ccic.safeliab.entity.QuestionCategories; import com.ccic.safeliab.service.ExamPaperService; -import com.ccic.safeliab.service.PaperQuestionService; import com.ccic.safeliab.util.R; import com.ccic.safeliab.vo.InsExamPaperVO; import org.springframework.beans.factory.annotation.Autowired; @@ -19,97 +18,108 @@ public class ExamPaperController { @Autowired private ExamPaperService examPaperService; - @Autowired - private PaperQuestionService paperQuestionService; - /** - * 获取试卷 - * @param vo 试卷对象（VO） + * 查询试卷 + * @param vo 试卷vo * @return 查询结果 */ - @PostMapping("/list") + @PostMapping("/getList") public R list(@RequestBody InsExamPaperVO vo) { ExamPapers entity = new ExamPapers(); entity.setIndustryId(vo.getIndustryId()); entity.setPaperName(vo.getPaperName()); + Map map = examPaperService.getList(vo.getPage(), vo.getNum(), entity); return R.ok().data(map); } /** - * 删除单个试卷 - */ - @GetMapping("/delete") - public R delete(String id) { - boolean flag = examPaperService.deleteExamPaperById(Long.valueOf((id))); - return R.ok().data(flag); - } - - /** - * 删除多个试卷 + * 删除试卷 + * @param ids 试卷ID + * @return 删除结果 */ - @PostMapping("/deleteList") - public R deleteList(@RequestBody List ids) { - boolean flag = examPaperService.deleteExamPaperListByIds(ids); - return R.ok().data(flag); + @PostMapping("/delExamPaper") + public R delExamPaper(@RequestBody List ids) { + boolean flag = examPaperService.delExamPaper(ids); + if (flag) { + return R.ok(); + } else { + return R.error(); + } } /** * 更新试卷状态 + * @param vo 试卷vo + * @return 更新结果 */ - @PostMapping("/updatePaperStatus") - public R updatePaperStatus(@RequestBody InsExamPaperVO vo) { - return R.ok().data(examPaperService.updatePaperStatus(vo) - ); - } - - /** - * 批量更新试卷状态 - */ - @PostMapping("/batchUpdatePaperStatus") - public R batchUpdatePaperStatus(@RequestBody List vos) { - boolean resultFlg = examPaperService.batchUpdatePaperStatus(vos); - return R.ok().data(resultFlg); + @PostMapping("/upPaperStatus") + public R upPaperStatus(@RequestBody InsExamPaperVO vo) { + boolean flag = examPaperService.upPaperStatus(vo); + if (flag) { + return R.ok(); + } else { + return R.error(); + } } /** * 随机获取试题 - * @param vo 题库对象（VO） - * @return 查询结果 + * @param vo 试卷vo + * @return 试题 */ @PostMapping("/getRandomQuestions") public R getRandomQuestions(@RequestBody InsExamPaperVO vo) { ExamPapers entity = new ExamPapers(); entity.setIndustryId(vo.getIndustryId()); entity.setQuestionCount(vo.getQuestionCount()); + List data = examPaperService.getRandomQuestions(entity); return R.ok().data(data); } /** - * 试卷详情 + * 获取试卷详情 + * @param id 试卷ID + * @return 试卷详情 */ - @GetMapping("/getDetail") + @GetMapping("/getExamPaperDetail") public R getDetail(String id) { - Map data = examPaperService.getDetail(id); + Map data = examPaperService.getExamPaperDetail(id); return R.ok().data(data); } /** * 添加试卷 + * @param vo 试卷vo + * @return 添加结果 */ - @PostMapping("/add") - public R add(@RequestBody InsExamPaperVO vo) { - ExamPapers examPapers = examPaperService.add(vo); - return R.ok().data(paperQuestionService.add(examPapers.getId(), vo.getQuestionIds())); + @PostMapping("/addExamPaper") + public R addExamPaper(@RequestBody InsExamPaperVO vo) { + boolean flag = false; + flag = examPaperService.addExamPaper(vo); + + if (flag) { + return R.ok(); + } else { + return R.error(); + } } /** * 修改试卷 + * @param vo 试卷vo + * @return 修改结果 */ - @PostMapping("/update") - public R update(@RequestBody InsExamPaperVO vo) { - ExamPapers examPapers =examPaperService.update(vo); - return R.ok().data(paperQuestionService.update(examPapers.getId(), vo.getQuestionIds())); + @PostMapping("/editExamPaper") + public R editExamPaper(@RequestBody InsExamPaperVO vo) { + boolean flag = false; + flag = examPaperService.editExamPaper(vo); + + if (flag) { + return R.ok(); + } else { + return R.error(); + } } -} +} \ No newline at end of file diff --git a/ccic-exam/src/main/java/com/ccic/safeliab/web/QuestionController.java b/ccic-exam/src/main/java/com/ccic/safeliab/web/QuestionController.java index 79ec603..7d4f413 100644 --- a/ccic-exam/src/main/java/com/ccic/safeliab/web/QuestionController.java +++ b/ccic-exam/src/main/java/com/ccic/safeliab/web/QuestionController.java @@ -29,6 +29,7 @@ public class QuestionController { entity.setIndustryId(vo.getIndustryId()); entity.setServiceTypeId(vo.getServiceTypeId()); entity.setQuestionContent(vo.getQuestionContent()); + Map map = questionService.getList(vo.getPage(), vo.getNum(), entity); return R.ok().data(map); } diff --git a/ccic-exam/src/main/resources/mappers/ExamPaperMapper.xml b/ccic-exam/src/main/resources/mappers/ExamPaperMapper.xml index 879b20e..9f3f1da 100644 --- a/ccic-exam/src/main/resources/mappers/ExamPaperMapper.xml +++ b/ccic-exam/src/main/resources/mappers/ExamPaperMapper.xml @@ -3,37 +3,40 @@ - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + + + + - SELECT - id - , paper_name - , industry_id - , question_count - , total_score - , exam_duration - , duration_type - , paper_content - , paper_status - FROM ex_exam_papers + id, + paper_name, + industry_id, + question_count, + total_score, + exam_duration, + duration_type, + paper_content, + paper_status + FROM + ex_exam_papers is_deleted = '0' @@ -98,23 +111,24 @@ + - - DELETE FROM ex_paper_questions - WHERE paper_id = #{id} - - + \ No newline at end of file diff --git a/ccic-exam/src/main/resources/mappers/PaperQuestionMapper.xml b/ccic-exam/src/main/resources/mappers/PaperQuestionMapper.xml index cca45ba..2e73ca4 100644 --- a/ccic-exam/src/main/resources/mappers/PaperQuestionMapper.xml +++ b/ccic-exam/src/main/resources/mappers/PaperQuestionMapper.xml @@ -5,4 +5,4 @@ DELETE FROM ex_paper_questions WHERE paper_id = #{id} - + \ No newline at end of file diff --git a/ccic-exam/src/main/resources/mappers/QuestionMapper.xml b/ccic-exam/src/main/resources/mappers/QuestionMapper.xml index a3ce3b7..4a38553 100644 --- a/ccic-exam/src/main/resources/mappers/QuestionMapper.xml +++ b/ccic-exam/src/main/resources/mappers/QuestionMapper.xml @@ -42,7 +42,8 @@ options, status, is_deleted - FROM ex_question_categories + FROM + ex_question_categories is_deleted = '0' @@ -55,14 +56,17 @@ AND question_content LIKE '%' || #{questionContent} || '%' - ORDER BY id DESC - LIMIT #{offset}, #{num}; + ORDER BY + id ASC + LIMIT + #{offset}, #{num};