fix 试卷题目

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

@@ -1,11 +1,12 @@
 package com.zhongzheng.modules.bank.bo;
 
+import com.zhongzheng.modules.course.bo.CourseChapterSectionListAddBo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -42,4 +43,9 @@ public class QuestionChapterAddBo {
     /** 编码 */
     @ApiModelProperty("编码")
     private String code;
+    /** 业务层级列表 */
+    @ApiModelProperty("业务层级列表")
+    private List<QuestionChapterBusinessAddBo> businessList;
+    @ApiModelProperty("节id列表")
+    private List<QuestionChapterExamAddBo> examList;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionChapterEditBo.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;
 
 
 /**
@@ -50,4 +51,10 @@ public class QuestionChapterEditBo {
     @ApiModelProperty("编码")
     private String code;
 
+    /** 业务层级列表 */
+    @ApiModelProperty("业务层级列表")
+    private List<QuestionChapterBusinessEditBo> businessList;
+    @ApiModelProperty("节id列表")
+    private List<QuestionChapterExamEditBo> examList;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionChapterExamAddBo.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;
+
+
+
+/**
+ * 章试卷关系添加对象 question_chapter_exam
+ *
+ * @author ruoyi
+ * @date 2021-10-25
+ */
+@Data
+@ApiModel("章试卷关系添加对象")
+public class QuestionChapterExamAddBo {
+
+    /** 试卷id */
+    @ApiModelProperty("试卷id")
+    private Long examId;
+    /** 章卷ID */
+    @ApiModelProperty("章卷ID")
+    private Long chapterExamId;
+    /** 排序 */
+    @ApiModelProperty("排序")
+    private Long sort;
+}

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

@@ -0,0 +1,37 @@
+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;
+
+
+/**
+ * 章试卷关系编辑对象 question_chapter_exam
+ *
+ * @author ruoyi
+ * @date 2021-10-25
+ */
+@Data
+@ApiModel("章试卷关系编辑对象")
+public class QuestionChapterExamEditBo {
+
+    /** 试卷id */
+    @ApiModelProperty("试卷id")
+    private Long examId;
+
+    /** 章卷ID */
+    @ApiModelProperty("章卷ID")
+    private Long chapterExamId;
+
+
+    /** 排序 */
+    @ApiModelProperty("排序")
+    private Long sort;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionChapterExamQueryBo.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;
+
+/**
+ * 章试卷关系分页查询对象 question_chapter_exam
+ *
+ * @author ruoyi
+ * @date 2021-10-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("章试卷关系分页查询对象")
+public class QuestionChapterExamQueryBo 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 chapterExamId;
+	/** 排序 */
+	@ApiModelProperty("排序")
+	private Long sort;
+}

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

@@ -23,6 +23,8 @@ public class QuestionBusiness implements Serializable {
 
 private static final long serialVersionUID=1L;
 
+
+
     /** $column.columnComment */
     @TableId(value = "id")
     private Long id;
@@ -35,7 +37,9 @@ private static final long serialVersionUID=1L;
     /** 科目id */
     private Long subjectId;
     /** $column.columnComment */
-    private Long questionId;
+    private Long majorId;
+
+    private Integer type;
 
     @TableField(exist = false)
     private String educationName;

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/domain/QuestionChapterExam.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;
+
+/**
+ * 章试卷关系对象 question_chapter_exam
+ *
+ * @author ruoyi
+ * @date 2021-10-25
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("question_chapter_exam")
+public class QuestionChapterExam implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** 试卷id */
+    private Long examId;
+    /** 章卷ID */
+    private Long chapterExamId;
+    /** 排序 */
+    private Long sort;
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+}

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

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.bank.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.bank.domain.QuestionChapterExam;
+
+/**
+ * 章试卷关系Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-10-25
+ */
+public interface QuestionChapterExamMapper extends BaseMapper<QuestionChapterExam> {
+
+}

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

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.bank.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.bank.bo.QuestionChapterExamAddBo;
+import com.zhongzheng.modules.bank.bo.QuestionChapterExamEditBo;
+import com.zhongzheng.modules.bank.bo.QuestionChapterExamQueryBo;
+import com.zhongzheng.modules.bank.domain.QuestionChapterExam;
+import com.zhongzheng.modules.bank.vo.QuestionChapterExamVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 章试卷关系Service接口
+ *
+ * @author ruoyi
+ * @date 2021-10-25
+ */
+public interface IQuestionChapterExamService extends IService<QuestionChapterExam> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	QuestionChapterExamVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<QuestionChapterExamVo> queryList(QuestionChapterExamQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入章试卷关系
+	 * @param bo 章试卷关系新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(QuestionChapterExamAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改章试卷关系
+	 * @param bo 章试卷关系编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(QuestionChapterExamEditBo 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/QuestionChapterExamServiceImpl.java

@@ -0,0 +1,99 @@
+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.QuestionChapterExamAddBo;
+import com.zhongzheng.modules.bank.bo.QuestionChapterExamEditBo;
+import com.zhongzheng.modules.bank.bo.QuestionChapterExamQueryBo;
+import com.zhongzheng.modules.bank.domain.QuestionChapterExam;
+import com.zhongzheng.modules.bank.mapper.QuestionChapterExamMapper;
+import com.zhongzheng.modules.bank.service.IQuestionChapterExamService;
+import com.zhongzheng.modules.bank.vo.QuestionChapterExamVo;
+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 ruoyi
+ * @date 2021-10-25
+ */
+@Service
+public class QuestionChapterExamServiceImpl extends ServiceImpl<QuestionChapterExamMapper, QuestionChapterExam> implements IQuestionChapterExamService {
+
+    @Override
+    public QuestionChapterExamVo queryById(Long id){
+        QuestionChapterExam db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, QuestionChapterExamVo.class);
+    }
+
+    @Override
+    public List<QuestionChapterExamVo> queryList(QuestionChapterExamQueryBo bo) {
+        LambdaQueryWrapper<QuestionChapterExam> lqw = Wrappers.lambdaQuery();
+        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());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<QuestionChapterExamVo> entity2Vo(Collection<QuestionChapterExam> collection) {
+        List<QuestionChapterExamVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, QuestionChapterExamVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<QuestionChapterExam> page = (Page<QuestionChapterExam>)collection;
+            Page<QuestionChapterExamVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(QuestionChapterExamAddBo bo) {
+        QuestionChapterExam add = BeanUtil.toBean(bo, QuestionChapterExam.class);
+        validEntityBeforeSave(add);
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(QuestionChapterExamEditBo bo) {
+        QuestionChapterExam update = BeanUtil.toBean(bo, QuestionChapterExam.class);
+        validEntityBeforeSave(update);
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(QuestionChapterExam 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/QuestionChapterServiceImpl.java

@@ -3,21 +3,26 @@ 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.QuestionChapterAddBo;
-import com.zhongzheng.modules.bank.bo.QuestionChapterEditBo;
-import com.zhongzheng.modules.bank.bo.QuestionChapterQueryBo;
+import com.zhongzheng.modules.bank.bo.*;
+import com.zhongzheng.modules.bank.domain.QuestionBusiness;
 import com.zhongzheng.modules.bank.domain.QuestionChapter;
+import com.zhongzheng.modules.bank.domain.QuestionChapterBusiness;
 import com.zhongzheng.modules.bank.mapper.QuestionChapterMapper;
+import com.zhongzheng.modules.bank.service.IQuestionBusinessService;
+import com.zhongzheng.modules.bank.service.IQuestionChapterBusinessService;
 import com.zhongzheng.modules.bank.service.IQuestionChapterService;
 import com.zhongzheng.modules.bank.vo.QuestionChapterVo;
+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;
 
@@ -30,6 +35,9 @@ import java.util.stream.Collectors;
 @Service
 public class QuestionChapterServiceImpl extends ServiceImpl<QuestionChapterMapper, QuestionChapter> implements IQuestionChapterService {
 
+    @Autowired
+    private IQuestionChapterBusinessService iQuestionChapterBusinessService;
+
     @Override
     public QuestionChapterVo queryById(Long chapterExamId){
         QuestionChapter db = this.baseMapper.selectById(chapterExamId);
@@ -69,19 +77,43 @@ public class QuestionChapterServiceImpl extends ServiceImpl<QuestionChapterMappe
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean insertByAddBo(QuestionChapterAddBo bo) {
         QuestionChapter add = BeanUtil.toBean(bo, QuestionChapter.class);
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
-        return this.save(add);
+        boolean result = this.save(add);
+        if(bo.getBusinessList()!=null){
+            Collection<QuestionChapterBusiness> coll = new HashSet<>();
+            for(int i=0;i<bo.getBusinessList().size();i++){
+                QuestionChapterBusinessAddBo item = bo.getBusinessList().get(i);
+                QuestionChapterBusiness addItem = BeanUtil.toBean(item,  QuestionChapterBusiness.class);
+                addItem.setChapterExamId(add.getChapterExamId());
+                coll.add(addItem);
+            }
+            iQuestionChapterBusinessService.saveBatch(coll);
+        }
+        return result;
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByEditBo(QuestionChapterEditBo bo) {
         QuestionChapter update = BeanUtil.toBean(bo, QuestionChapter.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
+        if(bo.getBusinessList()!=null){
+            iQuestionChapterBusinessService.remove(new LambdaQueryWrapper<QuestionChapterBusiness>().eq(QuestionChapterBusiness::getChapterExamId, bo.getChapterExamId()));
+            Collection<QuestionChapterBusiness> coll = new HashSet<>();
+            for(int i=0;i<bo.getBusinessList().size();i++){
+                QuestionChapterBusinessEditBo item = bo.getBusinessList().get(i);
+                QuestionChapterBusiness addItem = BeanUtil.toBean(item,  QuestionChapterBusiness.class);
+                addItem.setChapterExamId(update.getChapterExamId());
+                coll.add(addItem);
+            }
+            iQuestionChapterBusinessService.saveBatch(coll);
+        }
         return this.updateById(update);
     }
 

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

@@ -109,7 +109,8 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
             for(int i=0;i<bo.getBusinessList().size();i++){
                 QuestionBusinessAddBo item = bo.getBusinessList().get(i);
                 QuestionBusiness addItem = BeanUtil.toBean(item, QuestionBusiness.class);
-                addItem.setQuestionId(add.getQuestionId());
+                addItem.setMajorId(add.getQuestionId());
+                addItem.setType(1);
                 coll.add(addItem);
             }
             iQuestionBusinessService.saveBatch(coll);
@@ -127,12 +128,15 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
         if(bo.getBusinessList()!=null){
-            iQuestionBusinessService.remove(new LambdaQueryWrapper<QuestionBusiness>().eq(QuestionBusiness::getQuestionId, bo.getQuestionId()));
+            iQuestionBusinessService.remove(new LambdaQueryWrapper<QuestionBusiness>()
+                    .eq(QuestionBusiness::getMajorId, bo.getQuestionId())
+            .eq(QuestionBusiness::getType,1));
             Collection<QuestionBusiness> coll = new HashSet<>();
             for(int i=0;i<bo.getBusinessList().size();i++){
                 QuestionBusinessEditBo item = bo.getBusinessList().get(i);
                 QuestionBusiness addItem = BeanUtil.toBean(item, QuestionBusiness.class);
-                addItem.setQuestionId(bo.getQuestionId());
+                addItem.setMajorId(bo.getQuestionId());
+                addItem.setType(1);
                 coll.add(addItem);
             }
             iQuestionBusinessService.saveBatch(coll);

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

@@ -41,7 +41,7 @@ public class QuestionBusinessVo {
 	@ApiModelProperty("科目id")
 	private Long subjectId;
 	/** $column.columnComment */
-	@Excel(name = "科目id")
+	@Excel(name = "主id")
 	@ApiModelProperty("$column.columnComment")
-	private Long questionId;
+	private Long majorId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/vo/QuestionChapterExamVo.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 ruoyi
+ * @date 2021-10-25
+ */
+@Data
+@ApiModel("章试卷关系视图对象")
+public class QuestionChapterExamVo {
+	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 chapterExamId;
+	/** 排序 */
+	@Excel(name = "排序")
+	@ApiModelProperty("排序")
+	private Long sort;
+}

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

@@ -10,7 +10,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="businessId" column="business_id"/>
         <result property="projectId" column="project_id"/>
         <result property="subjectId" column="subject_id"/>
-        <result property="questionId" column="question_id"/>
+        <result property="majorId" column="major_id"/>
+        <result property="type" column="type"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.bank.domain.QuestionBusiness" id="QuestionBusiness">
@@ -40,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN course_business cb ON qb.business_id = cb.id
                 LEFT JOIN course_subject cs ON qb.subject_id = cs.id
         WHERE
-            qb.question_id =#{id}
+            type = 1 and qb.majorId =#{id}
     </select>
 
 </mapper>