fix 试卷题目

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

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -63,4 +63,6 @@ public class ExamAddBo {
     /** 试卷类型id */
     @ApiModelProperty("试卷类型id")
     private Long examPaperId;
+    @ApiModelProperty("题目列表")
+    private List<ExamQuestionAddBo> questionList;
 }

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -77,4 +78,7 @@ public class ExamEditBo {
     @ApiModelProperty("试卷类型id")
     private Long examPaperId;
 
+    @ApiModelProperty("题目列表")
+    private List<ExamQuestionAddBo> questionList;
+
 }

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

@@ -0,0 +1,30 @@
+package com.zhongzheng.modules.bank.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 试卷题目关系添加对象 exam_question
+ *
+ * @author hjl
+ * @date 2021-10-22
+ */
+@Data
+@ApiModel("试卷题目关系添加对象")
+public class ExamQuestionAddBo {
+
+    /** 试卷ID */
+    @ApiModelProperty("试卷ID")
+    private Long examId;
+    /** 题目ID */
+    @ApiModelProperty("题目ID")
+    private Long questionId;
+    /** 排序 */
+    @ApiModelProperty("排序")
+    private Integer sort;
+}

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

@@ -0,0 +1,36 @@
+package com.zhongzheng.modules.bank.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 试卷题目关系编辑对象 exam_question
+ *
+ * @author hjl
+ * @date 2021-10-22
+ */
+@Data
+@ApiModel("试卷题目关系编辑对象")
+public class ExamQuestionEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 试卷ID */
+    @ApiModelProperty("试卷ID")
+    private Long examId;
+
+    /** 题目ID */
+    @ApiModelProperty("题目ID")
+    private Long questionId;
+
+    /** 排序 */
+    @ApiModelProperty("排序")
+    private Integer sort;
+
+}

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

@@ -0,0 +1,48 @@
+package com.zhongzheng.modules.bank.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 试卷题目关系分页查询对象 exam_question
+ *
+ * @author hjl
+ * @date 2021-10-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("试卷题目关系分页查询对象")
+public class ExamQuestionQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 试卷ID */
+	@ApiModelProperty("试卷ID")
+	private Long examId;
+	/** 题目ID */
+	@ApiModelProperty("题目ID")
+	private Long questionId;
+	/** 排序 */
+	@ApiModelProperty("排序")
+	private Integer sort;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/domain/ExamQuestion.java

@@ -0,0 +1,35 @@
+package com.zhongzheng.modules.bank.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 试卷题目关系对象 exam_question
+ *
+ * @author hjl
+ * @date 2021-10-22
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("exam_question")
+public class ExamQuestion implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 试卷ID */
+    private Long examId;
+    /** 题目ID */
+    private Long questionId;
+    /** 排序 */
+    private Integer sort;
+}

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

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.bank.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.bank.domain.ExamQuestion;
+
+/**
+ * 试卷题目关系Mapper接口
+ *
+ * @author hjl
+ * @date 2021-10-22
+ */
+public interface ExamQuestionMapper extends BaseMapper<ExamQuestion> {
+
+}

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

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.bank.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.bank.bo.ExamQuestionAddBo;
+import com.zhongzheng.modules.bank.bo.ExamQuestionEditBo;
+import com.zhongzheng.modules.bank.bo.ExamQuestionQueryBo;
+import com.zhongzheng.modules.bank.domain.ExamQuestion;
+import com.zhongzheng.modules.bank.vo.ExamQuestionVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 试卷题目关系Service接口
+ *
+ * @author hjl
+ * @date 2021-10-22
+ */
+public interface IExamQuestionService extends IService<ExamQuestion> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	ExamQuestionVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<ExamQuestionVo> queryList(ExamQuestionQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入试卷题目关系
+	 * @param bo 试卷题目关系新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(ExamQuestionAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改试卷题目关系
+	 * @param bo 试卷题目关系编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(ExamQuestionEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -0,0 +1,98 @@
+package com.zhongzheng.modules.bank.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.bank.bo.ExamQuestionAddBo;
+import com.zhongzheng.modules.bank.bo.ExamQuestionEditBo;
+import com.zhongzheng.modules.bank.bo.ExamQuestionQueryBo;
+import com.zhongzheng.modules.bank.domain.ExamQuestion;
+import com.zhongzheng.modules.bank.mapper.ExamQuestionMapper;
+import com.zhongzheng.modules.bank.service.IExamQuestionService;
+import com.zhongzheng.modules.bank.vo.ExamQuestionVo;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 试卷题目关系Service业务层处理
+ *
+ * @author hjl
+ * @date 2021-10-22
+ */
+@Service
+public class ExamQuestionServiceImpl extends ServiceImpl<ExamQuestionMapper, ExamQuestion> implements IExamQuestionService {
+
+    @Override
+    public ExamQuestionVo queryById(Long id){
+        ExamQuestion db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, ExamQuestionVo.class);
+    }
+
+    @Override
+    public List<ExamQuestionVo> queryList(ExamQuestionQueryBo bo) {
+        LambdaQueryWrapper<ExamQuestion> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getExamId() != null, ExamQuestion::getExamId, bo.getExamId());
+        lqw.eq(bo.getQuestionId() != null, ExamQuestion::getQuestionId, bo.getQuestionId());
+        lqw.eq(bo.getSort() != null, ExamQuestion::getSort, bo.getSort());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<ExamQuestionVo> entity2Vo(Collection<ExamQuestion> collection) {
+        List<ExamQuestionVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, ExamQuestionVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<ExamQuestion> page = (Page<ExamQuestion>)collection;
+            Page<ExamQuestionVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(ExamQuestionAddBo bo) {
+        ExamQuestion add = BeanUtil.toBean(bo, ExamQuestion.class);
+        validEntityBeforeSave(add);
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(ExamQuestionEditBo bo) {
+        ExamQuestion update = BeanUtil.toBean(bo, ExamQuestion.class);
+        validEntityBeforeSave(update);
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(ExamQuestion entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

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

@@ -7,18 +7,27 @@ import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.modules.bank.bo.ExamAddBo;
 import com.zhongzheng.modules.bank.bo.ExamEditBo;
 import com.zhongzheng.modules.bank.bo.ExamQueryBo;
+import com.zhongzheng.modules.bank.bo.ExamQuestionAddBo;
 import com.zhongzheng.modules.bank.domain.Exam;
+import com.zhongzheng.modules.bank.domain.ExamQuestion;
 import com.zhongzheng.modules.bank.mapper.ExamMapper;
+import com.zhongzheng.modules.bank.service.IExamQuestionService;
 import com.zhongzheng.modules.bank.service.IExamService;
 import com.zhongzheng.modules.bank.vo.ExamVo;
+import com.zhongzheng.modules.course.bo.CourseChapterSectionListAddBo;
+import com.zhongzheng.modules.course.domain.CourseChapterSection;
+import com.zhongzheng.modules.course.service.ICourseChapterBusinessService;
+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;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.Page;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -31,6 +40,9 @@ import java.util.stream.Collectors;
 @Service
 public class ExamServiceImpl extends ServiceImpl<ExamMapper, Exam> implements IExamService {
 
+    @Autowired
+    private IExamQuestionService iExamQuestionService;
+
     @Override
     public ExamVo queryById(Long examId){
         Exam db = this.baseMapper.selectById(examId);
@@ -77,20 +89,50 @@ public class ExamServiceImpl extends ServiceImpl<ExamMapper, Exam> implements IE
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean insertByAddBo(ExamAddBo bo) {
         Exam add = BeanUtil.toBean(bo, Exam.class);
         add.setCode(ServletUtils.getEncoded("SJ"));
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
-        return this.save(add);
+        boolean result = this.save(add);
+        if(bo.getQuestionList()!=null){
+            Collection<ExamQuestion> coll = new HashSet<>();
+            for(int i=0;i<bo.getQuestionList().size();i++){
+                ExamQuestionAddBo item = bo.getQuestionList().get(i);
+                ExamQuestion addItem = new ExamQuestion();
+                addItem.setExamId(add.getExamId());
+                addItem.setQuestionId(item.getQuestionId());
+                addItem.setSort(item.getSort());
+                coll.add(addItem);
+
+            }
+            iExamQuestionService.saveBatch(coll);
+        }
+        return result;
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByEditBo(ExamEditBo bo) {
         Exam update = BeanUtil.toBean(bo, Exam.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
+        if(bo.getQuestionList()!=null){
+            Collection<ExamQuestion> coll = new HashSet<>();
+            iExamQuestionService.remove(new LambdaQueryWrapper<ExamQuestion>().eq(ExamQuestion::getExamId, bo.getExamId()));
+            for(int i=0;i<bo.getQuestionList().size();i++){
+                ExamQuestionAddBo item = bo.getQuestionList().get(i);
+                ExamQuestion addItem = new ExamQuestion();
+                addItem.setExamId(update.getExamId());
+                addItem.setQuestionId(item.getQuestionId());
+                addItem.setSort(item.getSort());
+                coll.add(addItem);
+
+            }
+            iExamQuestionService.saveBatch(coll);
+        }
         return this.updateById(update);
     }
 

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

@@ -0,0 +1,39 @@
+package com.zhongzheng.modules.bank.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 试卷题目关系视图对象 mall_package
+ *
+ * @author hjl
+ * @date 2021-10-22
+ */
+@Data
+@ApiModel("试卷题目关系视图对象")
+public class ExamQuestionVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 试卷ID */
+	@Excel(name = "试卷ID")
+	@ApiModelProperty("试卷ID")
+	private Long examId;
+	/** 题目ID */
+	@Excel(name = "题目ID")
+	@ApiModelProperty("题目ID")
+	private Long questionId;
+	/** 排序 */
+	@Excel(name = "排序")
+	@ApiModelProperty("排序")
+	private Integer sort;
+}

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

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zhongzheng.modules.bank.mapper.ExamQuestionMapper">
+
+    <resultMap type="com.zhongzheng.modules.bank.domain.ExamQuestion" id="ExamQuestionResult">
+        <result property="id" column="id"/>
+        <result property="examId" column="exam_id"/>
+        <result property="questionId" column="question_id"/>
+        <result property="sort" column="sort"/>
+    </resultMap>
+
+
+</mapper>