fix 卷列表

zhongzheng-admin/src/main/java/com/zhongzheng/controller/bank/QuestionModuleController.java

@@ -57,7 +57,7 @@ public class QuestionModuleController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo<QuestionModuleVo> list(QuestionModuleQueryBo bo) {
         startPage();
-        List<QuestionModuleVo> list = iQuestionModuleService.queryList(bo);
+        List<QuestionModuleVo> list = iQuestionModuleService.getList(bo);
         return getDataTable(list);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionModuleQueryBo.java

@@ -52,4 +52,16 @@ public class QuestionModuleQueryBo extends BaseEntity {
 	/** 编码 */
 	@ApiModelProperty("编码")
 	private String code;
+
+	@ApiModelProperty("教育类型ID")
+	private Long educationTypeId;
+	/** 业务层次id */
+	@ApiModelProperty("业务层次id")
+	private Long businessId;
+	/** 科目id */
+	@ApiModelProperty("科目id")
+	private Long subjectId;
+	/** 项目ID */
+	@ApiModelProperty("项目ID")
+	private Long projectId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/mapper/QuestionModuleMapper.java

@@ -1,7 +1,13 @@
 package com.zhongzheng.modules.bank.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.bank.bo.QuestionChapterQueryBo;
+import com.zhongzheng.modules.bank.bo.QuestionModuleQueryBo;
 import com.zhongzheng.modules.bank.domain.QuestionModule;
+import com.zhongzheng.modules.bank.vo.QuestionChapterVo;
+import com.zhongzheng.modules.bank.vo.QuestionModuleVo;
+
+import java.util.List;
 
 /**
  * 题目模块Mapper接口
@@ -10,5 +16,5 @@ import com.zhongzheng.modules.bank.domain.QuestionModule;
  * @date 2021-10-25
  */
 public interface QuestionModuleMapper extends BaseMapper<QuestionModule> {
-
+    List<QuestionModuleVo> getList(QuestionModuleQueryBo bo);
 }

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

@@ -23,6 +23,8 @@ public interface IQuestionModuleService extends IService<QuestionModule> {
 	 */
 	QuestionModuleVo queryById(Long questionModuleId);
 
+	List<QuestionModuleVo> getList(QuestionModuleQueryBo bo);
+
 	/**
 	 * 查询列表
 	 */

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

@@ -42,12 +42,20 @@ public class QuestionModuleServiceImpl extends ServiceImpl<QuestionModuleMapper,
     @Autowired
     private IQuestionModuleChapterService iQuestionModuleChapterService;
 
+    @Autowired
+    private QuestionModuleMapper questionModuleMapper;
+
     @Override
     public QuestionModuleVo queryById(Long questionModuleId){
         QuestionModule db = this.baseMapper.selectById(questionModuleId);
         return BeanUtil.toBean(db, QuestionModuleVo.class);
     }
 
+    @Override
+    public List<QuestionModuleVo> getList(QuestionModuleQueryBo bo) {
+        return questionModuleMapper.getList(bo);
+    }
+
     @Override
     public List<QuestionModuleVo> queryList(QuestionModuleQueryBo bo) {
         LambdaQueryWrapper<QuestionModule> lqw = Wrappers.lambdaQuery();

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/vo/QuestionModuleVo.java

@@ -46,4 +46,29 @@ public class QuestionModuleVo {
 	private String code;
 	@ApiModelProperty("商品列表")
 	private List<ExamGoodsVo> goodsList;
+
+
+	private String educationName;
+
+	private String projectName;
+
+	private String businessName;
+
+	private String subjectName;
+	/** 教育类型ID */
+	@Excel(name = "教育类型ID")
+	@ApiModelProperty("教育类型ID")
+	private Long educationTypeId;
+	/** 业务层次id */
+	@Excel(name = "业务层次id")
+	@ApiModelProperty("业务层次id")
+	private Long businessId;
+	/** 科目id */
+	@Excel(name = "科目id")
+	@ApiModelProperty("科目id")
+	private Long subjectId;
+	/** 项目ID */
+	@Excel(name = "项目ID")
+	@ApiModelProperty("项目ID")
+	private Long projectId;
 }

zhongzheng-system/src/main/resources/mapper/modules/bank/QuestionChapterMapper.xml

@@ -65,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
         question_chapter qc
         LEFT JOIN question_business qb ON qc.chapter_exam_id = qb.major_id
-        AND qb.type = 2
+        AND qb.type = 3
         LEFT JOIN course_education_type cet ON qb.education_type_id = cet.id
         LEFT JOIN course_project_type cpt ON qb.project_id = cpt.id
         LEFT JOIN course_business cb ON qb.business_id = cb.id

zhongzheng-system/src/main/resources/mapper/modules/bank/QuestionModuleMapper.xml

@@ -15,5 +15,80 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="code" column="code"/>
     </resultMap>
 
+    <resultMap type="com.zhongzheng.modules.bank.vo.QuestionModuleVo" id="QuestionModuleResultVo">
+        <result property="moduleExamId" column="module_exam_id"/>
+        <result property="prefixName" column="prefix_name"/>
+        <result property="moduleName" column="module_name"/>
+        <result property="publishStatus" column="publish_status"/>
+        <result property="status" column="status"/>
+        <result property="code" column="code"/>
+        <result property="educationName" column="education_name"/>
+        <result property="projectName" column="project_name"/>
+        <result property="businessName" column="business_name"/>
+        <result property="educationTypeId" column="education_type_id"/>
+        <result property="businessId" column="business_id"/>
+        <result property="subjectId" column="subject_id"/>
+        <result property="projectId" column="project_id"/>
+        <result property="subjectName" column="subject_name"/>
+        <collection property="goodsList" column="module_exam_id" select="findGoodsList"/>
+    </resultMap>
+
+    <select id="findGoodsList" resultMap="GoodsListResult">
+        SELECT
+            g.goods_name,
+            g.goods_id
+        FROM
+            goods_attached ga
+                LEFT JOIN goods g ON ga.goods_id = g.goods_id
+        WHERE
+            ga.major_id =#{module_exam_id} AND ga.type = 1
+    </select>
+
+    <resultMap type="com.zhongzheng.modules.bank.vo.ExamGoodsVo" id="GoodsListResult">
+        <result property="goodsName" column="goods_name"/>
+        <result property="goodsId" column="goods_id"/>
+    </resultMap>
 
+    <select id="getList" parameterType="com.zhongzheng.modules.bank.bo.QuestionModuleQueryBo" resultMap="QuestionModuleResultVo">
+        SELECT
+        qm.*,
+        qb.education_type_id,
+        qb.business_id,
+        qb.project_id,
+        qb.subject_id,
+        cet.education_name,
+        cpt.project_name,
+        cb.business_name,
+        cs.subject_name
+        FROM
+        question_module qm
+        LEFT JOIN question_business qb ON qm.module_exam_id = qb.major_id
+        AND qb.type = 4
+        LEFT JOIN course_education_type cet ON qb.education_type_id = cet.id
+        LEFT JOIN course_project_type cpt ON qb.project_id = cpt.id
+        LEFT JOIN course_business cb ON qb.business_id = cb.id
+        LEFT JOIN course_subject cs ON cs.id = qb.subject_id where 1=1
+        <if test="educationTypeId != null and educationTypeId != ''">
+            AND cet.id = #{educationTypeId}
+        </if>
+        <if test="subjectId != null and subjectId != ''">
+            AND cs.id = #{subjectId}
+        </if>
+        <if test="businessId != null and businessId != ''">
+            AND cb.id = #{businessId}
+        </if>
+        <if test="projectId != null and projectId != ''">
+            AND cpt.id = #{projectId}
+        </if>
+        <if test="publishStatus != null and publishStatus != ''">
+            AND qm.publish_status = #{publishStatus}
+        </if>
+        <if test="moduleName != null and moduleName != ''">
+            AND qm.module_name  like concat('%', #{moduleName}, '%')
+        </if>
+        <if test="prefixName != null and prefixName != ''">
+            AND qm.prefix_name  like concat('%', #{prefixName}, '%')
+        </if>
+        ORDER BY qm.module_exam_id DESC
+    </select>
 </mapper>