fix 课程目录卷

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

@@ -56,7 +56,7 @@ public class ExamController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo<ExamVo> list(ExamQueryBo bo) {
         startPage();
-        List<ExamVo> list = iExamService.queryList(bo);
+        List<ExamVo> list = iExamService.selectList(bo);
         return getDataTable(list);
     }
 

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseMenuExamController.java

@@ -50,7 +50,7 @@ public class CourseMenuExamController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo<CourseMenuExamVo> list(CourseMenuExamQueryBo bo) {
         startPage();
-        List<CourseMenuExamVo> list = iCourseMenuExamService.queryList(bo);
+        List<CourseMenuExamVo> list = iCourseMenuExamService.getList(bo);
         return getDataTable(list);
     }
 

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

@@ -65,4 +65,15 @@ public class ExamQueryBo extends BaseEntity {
 	/** 试卷类型id */
 	@ApiModelProperty("试卷类型id")
 	private Long examPaperId;
+	@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/ExamMapper.java

@@ -1,7 +1,13 @@
 package com.zhongzheng.modules.bank.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.bank.bo.ExamQueryBo;
+import com.zhongzheng.modules.bank.bo.QuestionQueryBo;
 import com.zhongzheng.modules.bank.domain.Exam;
+import com.zhongzheng.modules.bank.vo.ExamVo;
+import com.zhongzheng.modules.bank.vo.QuestionVo;
+
+import java.util.List;
 
 /**
  * 试卷Mapper接口
@@ -10,5 +16,5 @@ import com.zhongzheng.modules.bank.domain.Exam;
  * @date 2021-10-22
  */
 public interface ExamMapper extends BaseMapper<Exam> {
-
+    List<ExamVo> selectList(ExamQueryBo bo);
 }

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

@@ -23,6 +23,7 @@ public interface IExamService extends IService<Exam> {
 	 */
 	ExamVo queryById(Long examId);
 
+	List<ExamVo> selectList(ExamQueryBo bo);
 	/**
 	 * 查询列表
 	 */

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

@@ -45,12 +45,20 @@ public class ExamServiceImpl extends ServiceImpl<ExamMapper, Exam> implements IE
     @Autowired
     private IQuestionBusinessService iQuestionBusinessService;
 
+    @Autowired
+    private ExamMapper examMapper;
+
     @Override
     public ExamVo queryById(Long examId){
         Exam db = this.baseMapper.selectById(examId);
         return BeanUtil.toBean(db, ExamVo.class);
     }
 
+    @Override
+    public List<ExamVo> selectList(ExamQueryBo bo) {
+        return examMapper.selectList(bo);
+    }
+
     @Override
     public List<ExamVo> queryList(ExamQueryBo bo) {
         LambdaQueryWrapper<Exam> lqw = Wrappers.lambdaQuery();

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

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.bank.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.zhongzheng.common.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -99,4 +100,13 @@ public class ExamVo {
 	private Integer sort;
 	@ApiModelProperty("题目数")
 	private Integer questionNum;
+
+
+	private String educationName;
+
+	private String projectName;
+
+	private String businessName;
+
+	private String subjectName;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CourseMenuExamMapper.java

@@ -1,7 +1,13 @@
 package com.zhongzheng.modules.course.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.course.bo.CourseMenuExamQueryBo;
+import com.zhongzheng.modules.course.bo.CourseQueryBo;
 import com.zhongzheng.modules.course.domain.CourseMenuExam;
+import com.zhongzheng.modules.course.vo.CourseMenuExamVo;
+import com.zhongzheng.modules.course.vo.CourseVo;
+
+import java.util.List;
 
 /**
  * 课程目录关联卷Mapper接口
@@ -10,5 +16,5 @@ import com.zhongzheng.modules.course.domain.CourseMenuExam;
  * @date 2021-11-17
  */
 public interface CourseMenuExamMapper extends BaseMapper<CourseMenuExam> {
-
+    List<CourseMenuExamVo> getList(CourseMenuExamQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/ICourseMenuExamService.java

@@ -23,6 +23,8 @@ public interface ICourseMenuExamService extends IService<CourseMenuExam> {
 	 */
 	CourseMenuExamVo queryById(Long id);
 
+	List<CourseMenuExamVo> getList(CourseMenuExamQueryBo bo);
+
 	/**
 	 * 查询列表
 	 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseMenuExamServiceImpl.java

@@ -8,8 +8,10 @@ import com.zhongzheng.modules.course.bo.CourseMenuExamEditBo;
 import com.zhongzheng.modules.course.bo.CourseMenuExamQueryBo;
 import com.zhongzheng.modules.course.domain.CourseMenuExam;
 import com.zhongzheng.modules.course.mapper.CourseMenuExamMapper;
+import com.zhongzheng.modules.course.mapper.CourseMenuMapper;
 import com.zhongzheng.modules.course.service.ICourseMenuExamService;
 import com.zhongzheng.modules.course.vo.CourseMenuExamVo;
+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;
@@ -30,12 +32,20 @@ import java.util.stream.Collectors;
 @Service
 public class CourseMenuExamServiceImpl extends ServiceImpl<CourseMenuExamMapper, CourseMenuExam> implements ICourseMenuExamService {
 
+    @Autowired
+    private CourseMenuExamMapper courseMenuExamMapper;
+
     @Override
     public CourseMenuExamVo queryById(Long id){
         CourseMenuExam db = this.baseMapper.selectById(id);
         return BeanUtil.toBean(db, CourseMenuExamVo.class);
     }
 
+    @Override
+    public List<CourseMenuExamVo> getList(CourseMenuExamQueryBo bo) {
+        return courseMenuExamMapper.getList(bo);
+    }
+
     @Override
     public List<CourseMenuExamVo> queryList(CourseMenuExamQueryBo bo) {
         LambdaQueryWrapper<CourseMenuExam> lqw = Wrappers.lambdaQuery();

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseMenuServiceImpl.java

@@ -104,6 +104,8 @@ public class CourseMenuServiceImpl extends ServiceImpl<CourseMenuMapper, CourseM
                     CourseMenuExam addItem = BeanUtil.toBean(bo.getMenuExamList().get(i), CourseMenuExam.class);
                     addItem.setType(1);
                     addItem.setCourseId(bo.getCourseId());
+                    addItem.setCreateTime(DateUtils.getNowTime());
+                    addItem.setUpdateTime(DateUtils.getNowTime());
                     coll.add(addItem);
                 }
                 iCourseMenuExamService.saveBatch(coll);
@@ -132,6 +134,8 @@ public class CourseMenuServiceImpl extends ServiceImpl<CourseMenuMapper, CourseM
                 CourseMenuExam addItem = BeanUtil.toBean(bo.getMenuExamList().get(i), CourseMenuExam.class);
                 addItem.setType(1);
                 addItem.setCourseId(bo.getCourseId());
+                addItem.setCreateTime(DateUtils.getNowTime());
+                addItem.setUpdateTime(DateUtils.getNowTime());
                 coll.add(addItem);
             }
             iCourseMenuExamService.saveBatch(coll);

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseMenuExamVo.java

@@ -48,4 +48,6 @@ public class CourseMenuExamVo {
 	@Excel(name = "卷ID")
 	@ApiModelProperty("卷ID")
 	private Long examId;
+	@ApiModelProperty("卷名称")
+	private String examName;
 }

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

@@ -23,5 +23,61 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="sort" column="sort"/>
     </resultMap>
 
+    <resultMap type="com.zhongzheng.modules.bank.vo.ExamVo" id="ExamVoResult">
+        <result property="examId" column="exam_id"/>
+        <result property="status" column="status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="prefixName" column="prefix_name"/>
+        <result property="code" column="code"/>
+        <result property="examName" column="exam_name"/>
+        <result property="publishStatus" column="publish_status"/>
+        <result property="year" column="year"/>
+        <result property="cityId" column="city_id"/>
+        <result property="provinceId" column="province_id"/>
+        <result property="examPaperId" column="exam_paper_id"/>
+        <result property="answerTime" column="answer_time"/>
+        <result property="examPaperId" column="exam_paper_id"/>
+        <result property="answerNum" column="answer_num"/>
+        <result property="sort" column="sort"/>
+        <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"/>
+    </resultMap>
 
+    <select id="getList" parameterType="com.zhongzheng.modules.bank.bo.ExamQueryBo" resultMap="ExamVoResult">
+        SELECT
+            e.*,
+        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
+            exam e
+                LEFT JOIN question_business qb ON e.exam_id = qb.major_id
+                AND qb.type = 2
+                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
+        <if test="educationTypeId != null and educationTypeId != ''">
+            AND qb.education_type_id = #{educationTypeId}
+        </if>
+        <if test="subjectId != null and subjectId != ''">
+            AND qb.subject_id = #{subjectId}
+        </if>
+        <if test="businessId != null and businessId != ''">
+            AND qb.business_id = #{businessId}
+        </if>
+        ORDER BY e.exam_id DESC
+    </select>
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/course/CourseMenuExamMapper.xml

@@ -16,5 +16,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
     </resultMap>
 
+    <resultMap type="com.zhongzheng.modules.course.domain.CourseMenuExamVo" id="CourseMenuExamVoResult">
+        <result property="id" column="id"/>
+        <result property="courseId" column="course_id"/>
+        <result property="moduleId" column="module_id"/>
+        <result property="chapterId" column="chapter_id"/>
+        <result property="sectionId" column="section_id"/>
+        <result property="type" column="type"/>
+        <result property="examId" column="exam_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="examName" column="exam_name"/>
+    </resultMap>
+
+    <select id="getList" parameterType="com.zhongzheng.modules.course.bo.CourseMenuExamQueryBo" resultMap="CourseMenuExamVoResult">
+        SELECT
+            cme.*,
+            e.exam_name
+        FROM
+            course_menu_exam cme
+                LEFT JOIN exam e ON cme.exam_id = e.exam_id
+                AND cem.type = 1
+                AND cme.course_id = #{courseId}
+    </select>
 
 </mapper>