Parcourir la source

fix 返回试卷题目数量

he2802 il y a 4 ans
Parent
commit
a7c3055166

+ 1 - 1
zhongzheng-admin/src/main/java/com/zhongzheng/controller/bank/QuestionBankExamController.java

@@ -50,7 +50,7 @@ public class QuestionBankExamController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo<QuestionBankExamVo> list(QuestionBankExamQueryBo bo) {
         startPage();
-        List<QuestionBankExamVo> list = iQuestionBankExamService.queryList(bo);
+        List<QuestionBankExamVo> list = iQuestionBankExamService.selectBankExamList(bo);
         return getDataTable(list);
     }
 

+ 2 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionBankExamQueryBo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -47,6 +48,6 @@ public class QuestionBankExamQueryBo extends BaseEntity {
 	private Long sort;
 	/** 状态 1正常 0关闭 */
 	@ApiModelProperty("状态 1正常 0关闭")
-	private Integer status;
+	private List<Integer> status;
 
 }

+ 2 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionBankSectionQueryBo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -44,7 +45,7 @@ public class QuestionBankSectionQueryBo extends BaseEntity {
 	private String name;
 	/** 状态 1正常 0关闭 */
 	@ApiModelProperty("状态 1正常 0关闭")
-	private Integer status;
+	private List<Integer> status;
 	/** 排序 */
 	@ApiModelProperty("排序")
 	private Long sort;

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/domain/QuestionBankExam.java

@@ -47,5 +47,7 @@ private static final long serialVersionUID=1L;
 
     /** 状态 1正常 0关闭 */
     private Integer status;
+    @TableField(exist = false)
+    private Integer questionNum;
 
 }

+ 7 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/mapper/QuestionBankExamMapper.java

@@ -1,7 +1,13 @@
 package com.zhongzheng.modules.bank.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.bank.bo.QuestionBankExamQueryBo;
+import com.zhongzheng.modules.bank.bo.QuestionBankSectionQueryBo;
 import com.zhongzheng.modules.bank.domain.QuestionBankExam;
+import com.zhongzheng.modules.bank.vo.QuestionBankExamVo;
+import com.zhongzheng.modules.bank.vo.QuestionBankSectionVo;
+
+import java.util.List;
 
 /**
  * 题库试卷Mapper接口
@@ -10,5 +16,6 @@ import com.zhongzheng.modules.bank.domain.QuestionBankExam;
  * @date 2021-05-20
  */
 public interface QuestionBankExamMapper extends BaseMapper<QuestionBankExam> {
+    List<QuestionBankExamVo> selectBankExamList(QuestionBankExamQueryBo bo);
 
 }

+ 4 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/IQuestionBankExamService.java

@@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.zhongzheng.modules.bank.bo.QuestionBankExamAddBo;
 import com.zhongzheng.modules.bank.bo.QuestionBankExamEditBo;
 import com.zhongzheng.modules.bank.bo.QuestionBankExamQueryBo;
+import com.zhongzheng.modules.bank.bo.QuestionBankSectionQueryBo;
 import com.zhongzheng.modules.bank.domain.QuestionBankExam;
 import com.zhongzheng.modules.bank.vo.QuestionBankExamVo;
+import com.zhongzheng.modules.bank.vo.QuestionBankSectionVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -28,6 +30,8 @@ public interface IQuestionBankExamService extends IService<QuestionBankExam> {
 	 */
 	List<QuestionBankExamVo> queryList(QuestionBankExamQueryBo bo);
 
+	List<QuestionBankExamVo> selectBankExamList(QuestionBankExamQueryBo bo);
+
 	/**
 	 * 根据新增业务对象插入题库试卷
 	 * @param bo 题库试卷新增业务对象

+ 10 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionBankExamServiceImpl.java

@@ -8,8 +8,10 @@ import com.zhongzheng.modules.bank.bo.QuestionBankExamEditBo;
 import com.zhongzheng.modules.bank.bo.QuestionBankExamQueryBo;
 import com.zhongzheng.modules.bank.domain.QuestionBankExam;
 import com.zhongzheng.modules.bank.mapper.QuestionBankExamMapper;
+import com.zhongzheng.modules.bank.mapper.QuestionBankSectionMapper;
 import com.zhongzheng.modules.bank.service.IQuestionBankExamService;
 import com.zhongzheng.modules.bank.vo.QuestionBankExamVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -31,6 +33,9 @@ import java.util.stream.Collectors;
 @Service
 public class QuestionBankExamServiceImpl extends ServiceImpl<QuestionBankExamMapper, QuestionBankExam> implements IQuestionBankExamService {
 
+    @Autowired
+    private QuestionBankExamMapper questionBankExamMapper;
+
     @Override
     public QuestionBankExamVo queryById(Long examId){
         QuestionBankExam db = this.baseMapper.selectById(examId);
@@ -47,6 +52,11 @@ public class QuestionBankExamServiceImpl extends ServiceImpl<QuestionBankExamMap
         return entity2Vo(this.list(lqw));
     }
 
+    @Override
+    public List<QuestionBankExamVo> selectBankExamList(QuestionBankExamQueryBo bo) {
+        return questionBankExamMapper.selectBankExamList(bo);
+    }
+
     /**
     * 实体类转化成视图对象
     *

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/vo/QuestionBankExamVo.java

@@ -40,5 +40,7 @@ public class QuestionBankExamVo {
 	@Excel(name = "状态 1正常 0关闭")
 	@ApiModelProperty("状态 1正常 0关闭")
 	private Integer status;
+	@ApiModelProperty("题目数量")
+	private Integer questionNum;
 
 }

+ 21 - 0
zhongzheng-system/src/main/resources/mapper/modules/bank/QuestionBankExamMapper.xml

@@ -12,7 +12,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
         <result property="status" column="status"/>
+        <result property="questionNum" column="question_num"/>
     </resultMap>
 
+    <select id="selectBankExamList" parameterType="com.zhongzheng.modules.bank.bo.QuestionBankSectionQueryBo"  resultMap="QuestionBankExamResult">
+        SELECT
+        qbe.*,
+        count( q.question_id ) AS question_num
+        FROM
+        question_bank_exam qbe
+        LEFT JOIN question q ON qbe.exam_id = q.exam_id
+        <if test="status != null and status.size()!=0 ">
+            WHERE qbe.status in
+            <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="name != null and name != ''">
+            AND qbe.name like concat('%', #{name}, '%')
+        </if>
+        GROUP BY
+        qbe.exam_id
+    </select>
+
 
 </mapper>