fix 下一章卷

zhongzheng-api/src/main/java/com/zhongzheng/controller/bank/ExamController.java

@@ -74,7 +74,7 @@ public class ExamController extends BaseController {
     }
 
     /**
-     * 获取试卷详细信息
+     * 获取本章的下一张试卷
      */
     @ApiOperation("获取本章的下一张试卷")
     @GetMapping("/nextExam")

zhongzheng-api/src/main/java/com/zhongzheng/controller/cmmon/CommonBankController.java

@@ -66,7 +66,7 @@ public class CommonBankController extends BaseController {
     @ApiOperation("查询题库商品试卷列表")
     @GetMapping("/list")
     public AjaxResult<List<GoodsAttachedVo>> bankList(GoodsAttachedQueryBo bo) {
-        List<GoodsAttachedVo> list = iGoodsAttachedService.selectList(bo);
+        List<GoodsAttachedVo> list = iGoodsAttachedService.getList(bo);
         return AjaxResult.success(list);
     }
 

zhongzheng-api/src/main/java/com/zhongzheng/controller/cmmon/CommonGoodsController.java

@@ -70,7 +70,7 @@ public class CommonGoodsController extends BaseController {
     @ApiOperation("查询商品题库目录列表")
     @GetMapping("/bank/list")
     public AjaxResult<List<GoodsAttachedVo>> bankList(GoodsAttachedQueryBo bo) {
-        List<GoodsAttachedVo> list = iGoodsAttachedService.selectList(bo);
+        List<GoodsAttachedVo> list = iGoodsAttachedService.getList(bo);
         return AjaxResult.success(list);
     }
 

zhongzheng-api/src/main/java/com/zhongzheng/controller/goods/GoodsController.java

@@ -139,7 +139,7 @@ public class GoodsController extends BaseController {
     public AjaxResult<List<GoodsAttachedVo>> bankList(GoodsAttachedQueryBo bo) {
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
-        List<GoodsAttachedVo> list = iGoodsAttachedService.selectList(bo);
+        List<GoodsAttachedVo> list = iGoodsAttachedService.getList(bo);
         return AjaxResult.success(list);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/ExamServiceImpl.java

@@ -225,7 +225,7 @@ public class ExamServiceImpl extends ServiceImpl<ExamMapper, Exam> implements IE
     public ExamVo getNextExam(QuestionChapterExamQueryBo bo) {
         ExamVo nextExam = null;
         //有章卷ID
-        if(Validator.isNotEmpty(bo.getChapterExamId())){
+        if(Validator.isNotEmpty(bo.getChapterExamId())&&bo.getChapterExamId().longValue()>0){
             QuestionChapterExamQueryBo bo1 = new QuestionChapterExamQueryBo();
             bo1.setChapterExamId(bo.getChapterExamId());
             List<QuestionChapterExamVo>  list = iQuestionChapterExamService.queryList(bo1);

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionChapterExamServiceImpl.java

@@ -59,6 +59,7 @@ public class QuestionChapterExamServiceImpl extends ServiceImpl<QuestionChapterE
         lqw.eq(bo.getExamId() != null, QuestionChapterExam::getExamId, bo.getExamId());
         lqw.eq(bo.getChapterExamId() != null, QuestionChapterExam::getChapterExamId, bo.getChapterExamId());
         lqw.eq(bo.getSort() != null, QuestionChapterExam::getSort, bo.getSort());
+        lqw.orderByAsc(QuestionChapterExam::getSort);
         return entity2Vo(this.list(lqw));
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/mapper/GoodsAttachedMapper.java

@@ -16,6 +16,6 @@ import java.util.List;
  * @date 2021-10-28
  */
 public interface GoodsAttachedMapper extends BaseMapper<GoodsAttached> {
-    List<GoodsAttachedVo> selectList(GoodsAttachedQueryBo bo);
+    List<GoodsAttachedVo> getList(GoodsAttachedQueryBo bo);
     List<GoodsAttachedVo> selectDoList(GoodsAttachedQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/IGoodsAttachedService.java

@@ -30,7 +30,7 @@ public interface IGoodsAttachedService extends IService<GoodsAttached> {
 	 */
 	List<GoodsAttachedVo> queryList(GoodsAttachedQueryBo bo);
 
-	List<GoodsAttachedVo> selectList(GoodsAttachedQueryBo bo);
+	List<GoodsAttachedVo> getList(GoodsAttachedQueryBo bo);
 
 	/**
 	 * 根据新增业务对象插入商品附加产品

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsAttachedServiceImpl.java

@@ -54,12 +54,13 @@ public class GoodsAttachedServiceImpl extends ServiceImpl<GoodsAttachedMapper, G
         lqw.eq(bo.getMajorId() != null, GoodsAttached::getMajorId, bo.getMajorId());
         lqw.eq(bo.getSort() != null, GoodsAttached::getSort, bo.getSort());
         lqw.eq(bo.getType() != null, GoodsAttached::getType, bo.getType());
+        lqw.orderByAsc(GoodsAttached::getSort);
         return entity2Vo(this.list(lqw));
     }
 
     @Override
-    public List<GoodsAttachedVo> selectList(GoodsAttachedQueryBo bo) {
-        return goodsAttachedMapper.selectList(bo);
+    public List<GoodsAttachedVo> getList(GoodsAttachedQueryBo bo) {
+        return goodsAttachedMapper.getList(bo);
     }
 
     /**

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/service/impl/InformServiceImpl.java

@@ -327,7 +327,7 @@ public class InformServiceImpl extends ServiceImpl<InformMapper, Inform> impleme
 
     @Override
     public List<GoodsInformAttachedVo> bankList(GoodsAttachedQueryBo bo) {
-        List<GoodsInformAttachedVo> goodsInformAttachedVos = entity2BankVo(goodsAttachedMapper.selectList(bo));
+        List<GoodsInformAttachedVo> goodsInformAttachedVos = entity2BankVo(goodsAttachedMapper.getList(bo));
         for (GoodsInformAttachedVo goodsInformAttachedVo : goodsInformAttachedVos) {
             if (goodsInformAttachedVo.getType().equals(1)){
                 QuestionModuleChapterQueryBo questionModuleChapterQueryBo = new QuestionModuleChapterQueryBo();

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsAttachedMapper.xml

@@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="answerNum" column="answer_num"/>
     </resultMap>
 
-    <select id="selectList" parameterType="com.zhongzheng.modules.goods.bo.GoodsAttachedQueryBo" resultMap="GoodsAttachedResultVo">
+    <select id="getList" parameterType="com.zhongzheng.modules.goods.bo.GoodsAttachedQueryBo" resultMap="GoodsAttachedResultVo">
 		SELECT
 			ga.*,
 			CASE