fix 题库模块

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

@@ -42,4 +42,6 @@ public class QuestionModuleAddBo {
     /** 业务层级列表 */
     @ApiModelProperty("业务层级列表")
     private List<QuestionBusinessAddBo> businessList;
+    @ApiModelProperty("章卷id列表")
+    private List<QuestionModuleChapterAddBo> chapterList;
 }

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

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionModuleChapterEditBo.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_module_chapter
+ *
+ * @author hjl
+ * @date 2021-10-26
+ */
+@Data
+@ApiModel("模块卷章卷关系编辑对象")
+public class QuestionModuleChapterEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 模块卷id */
+    @ApiModelProperty("模块卷id")
+    private Long moduleExamId;
+
+    /** 章卷ID */
+    @ApiModelProperty("章卷ID")
+    private Long chapterExamId;
+
+
+    /** 排序 */
+    @ApiModelProperty("排序")
+    private Long sort;
+
+}

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

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

@@ -20,7 +20,7 @@ public class QuestionModuleEditBo {
 
     /** 题模块ID */
     @ApiModelProperty("题模块ID")
-    private Long questionModuleId;
+    private Long moduleExamId;
 
     /** 前缀名称 */
     @ApiModelProperty("前缀名称")
@@ -49,4 +49,6 @@ public class QuestionModuleEditBo {
     /** 业务层级列表 */
     @ApiModelProperty("业务层级列表")
     private List<QuestionBusinessEditBo> businessList;
+    @ApiModelProperty("章卷id列表")
+    private List<QuestionModuleChapterEditBo> chapterList;
 }

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

@@ -24,8 +24,8 @@ public class QuestionModule implements Serializable {
 private static final long serialVersionUID=1L;
 
     /** 题模块ID */
-    @TableId(value = "question_module_id")
-    private Long questionModuleId;
+    @TableId(value = "module_exam_id")
+    private Long moduleExamId;
     /** 前缀名称 */
     private String prefixName;
     /** 模块名称 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/domain/QuestionModuleChapter.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_module_chapter
+ *
+ * @author hjl
+ * @date 2021-10-26
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("question_module_chapter")
+public class QuestionModuleChapter implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 模块卷id */
+    private Long moduleExamId;
+    /** 章卷ID */
+    private Long chapterExamId;
+    /** 排序 */
+    private Long sort;
+}

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

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.bank.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.bank.domain.QuestionModuleChapter;
+
+/**
+ * 模块卷章卷关系Mapper接口
+ *
+ * @author hjl
+ * @date 2021-10-26
+ */
+public interface QuestionModuleChapterMapper extends BaseMapper<QuestionModuleChapter> {
+
+}

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

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.bank.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.bank.bo.QuestionModuleChapterAddBo;
+import com.zhongzheng.modules.bank.bo.QuestionModuleChapterEditBo;
+import com.zhongzheng.modules.bank.bo.QuestionModuleChapterQueryBo;
+import com.zhongzheng.modules.bank.domain.QuestionModuleChapter;
+import com.zhongzheng.modules.bank.vo.QuestionModuleChapterVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 模块卷章卷关系Service接口
+ *
+ * @author hjl
+ * @date 2021-10-26
+ */
+public interface IQuestionModuleChapterService extends IService<QuestionModuleChapter> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	QuestionModuleChapterVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<QuestionModuleChapterVo> queryList(QuestionModuleChapterQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入模块卷章卷关系
+	 * @param bo 模块卷章卷关系新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(QuestionModuleChapterAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改模块卷章卷关系
+	 * @param bo 模块卷章卷关系编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(QuestionModuleChapterEditBo 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/QuestionModuleChapterServiceImpl.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.QuestionModuleChapterAddBo;
+import com.zhongzheng.modules.bank.bo.QuestionModuleChapterEditBo;
+import com.zhongzheng.modules.bank.bo.QuestionModuleChapterQueryBo;
+import com.zhongzheng.modules.bank.domain.QuestionModuleChapter;
+import com.zhongzheng.modules.bank.mapper.QuestionModuleChapterMapper;
+import com.zhongzheng.modules.bank.service.IQuestionModuleChapterService;
+import com.zhongzheng.modules.bank.vo.QuestionModuleChapterVo;
+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-26
+ */
+@Service
+public class QuestionModuleChapterServiceImpl extends ServiceImpl<QuestionModuleChapterMapper, QuestionModuleChapter> implements IQuestionModuleChapterService {
+
+    @Override
+    public QuestionModuleChapterVo queryById(Long id){
+        QuestionModuleChapter db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, QuestionModuleChapterVo.class);
+    }
+
+    @Override
+    public List<QuestionModuleChapterVo> queryList(QuestionModuleChapterQueryBo bo) {
+        LambdaQueryWrapper<QuestionModuleChapter> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getModuleExamId() != null, QuestionModuleChapter::getModuleExamId, bo.getModuleExamId());
+        lqw.eq(bo.getChapterExamId() != null, QuestionModuleChapter::getChapterExamId, bo.getChapterExamId());
+        lqw.eq(bo.getSort() != null, QuestionModuleChapter::getSort, bo.getSort());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<QuestionModuleChapterVo> entity2Vo(Collection<QuestionModuleChapter> collection) {
+        List<QuestionModuleChapterVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, QuestionModuleChapterVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<QuestionModuleChapter> page = (Page<QuestionModuleChapter>)collection;
+            Page<QuestionModuleChapterVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(QuestionModuleChapterAddBo bo) {
+        QuestionModuleChapter add = BeanUtil.toBean(bo, QuestionModuleChapter.class);
+        validEntityBeforeSave(add);
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(QuestionModuleChapterEditBo bo) {
+        QuestionModuleChapter update = BeanUtil.toBean(bo, QuestionModuleChapter.class);
+        validEntityBeforeSave(update);
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(QuestionModuleChapter 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/QuestionModuleServiceImpl.java

@@ -7,8 +7,10 @@ import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.modules.bank.bo.*;
 import com.zhongzheng.modules.bank.domain.QuestionBusiness;
 import com.zhongzheng.modules.bank.domain.QuestionModule;
+import com.zhongzheng.modules.bank.domain.QuestionModuleChapter;
 import com.zhongzheng.modules.bank.mapper.QuestionModuleMapper;
 import com.zhongzheng.modules.bank.service.IQuestionBusinessService;
+import com.zhongzheng.modules.bank.service.IQuestionModuleChapterService;
 import com.zhongzheng.modules.bank.service.IQuestionModuleService;
 import com.zhongzheng.modules.bank.vo.QuestionModuleVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,6 +39,9 @@ public class QuestionModuleServiceImpl extends ServiceImpl<QuestionModuleMapper,
     @Autowired
     private IQuestionBusinessService iQuestionBusinessService;
 
+    @Autowired
+    private IQuestionModuleChapterService iQuestionModuleChapterService;
+
     @Override
     public QuestionModuleVo queryById(Long questionModuleId){
         QuestionModule db = this.baseMapper.selectById(questionModuleId);
@@ -88,12 +93,22 @@ public class QuestionModuleServiceImpl extends ServiceImpl<QuestionModuleMapper,
             for(int i=0;i<bo.getBusinessList().size();i++){
                 QuestionBusinessAddBo item = bo.getBusinessList().get(i);
                 QuestionBusiness addItem = BeanUtil.toBean(item,  QuestionBusiness.class);
-                addItem.setMajorId(add.getQuestionModuleId());
+                addItem.setMajorId(add.getModuleExamId());
                 addItem.setType(QuestionBusiness.TYPE_QUESTION_MODULE);
                 coll.add(addItem);
             }
             iQuestionBusinessService.saveBatch(coll);
         }
+        if(bo.getChapterList()!=null){
+            Collection<QuestionModuleChapter> coll = new HashSet<>();
+            for(int i=0;i<bo.getChapterList().size();i++){
+                QuestionModuleChapterAddBo item = bo.getChapterList().get(i);
+                QuestionModuleChapter addItem = BeanUtil.toBean(item,  QuestionModuleChapter.class);
+                addItem.setModuleExamId(add.getModuleExamId());
+                coll.add(addItem);
+            }
+            iQuestionModuleChapterService.saveBatch(coll);
+        }
         return result;
     }
 
@@ -104,18 +119,29 @@ public class QuestionModuleServiceImpl extends ServiceImpl<QuestionModuleMapper,
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
         if(bo.getBusinessList()!=null){
-            iQuestionBusinessService.remove(new LambdaQueryWrapper<QuestionBusiness>().eq(QuestionBusiness::getMajorId, bo.getQuestionModuleId())
+            iQuestionBusinessService.remove(new LambdaQueryWrapper<QuestionBusiness>().eq(QuestionBusiness::getMajorId, bo.getModuleExamId())
                     .eq(QuestionBusiness::getType,QuestionBusiness.TYPE_QUESTION_MODULE));
             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.setMajorId(update.getQuestionModuleId());
+                addItem.setMajorId(update.getModuleExamId());
                 addItem.setType(QuestionBusiness.TYPE_QUESTION_MODULE);
                 coll.add(addItem);
             }
             iQuestionBusinessService.saveBatch(coll);
         }
+        if(bo.getChapterList()!=null){
+            iQuestionModuleChapterService.remove(new LambdaQueryWrapper<QuestionModuleChapter>().eq(QuestionModuleChapter::getModuleExamId, bo.getModuleExamId()));
+            Collection<QuestionModuleChapter> coll = new HashSet<>();
+            for(int i=0;i<bo.getChapterList().size();i++){
+                QuestionModuleChapterEditBo item = bo.getChapterList().get(i);
+                QuestionModuleChapter addItem = BeanUtil.toBean(item,  QuestionModuleChapter.class);
+                addItem.setModuleExamId(bo.getModuleExamId());
+                coll.add(addItem);
+            }
+            iQuestionModuleChapterService.saveBatch(coll);
+        }
         return this.updateById(update);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/vo/QuestionModuleChapterVo.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-26
+ */
+@Data
+@ApiModel("模块卷章卷关系视图对象")
+public class QuestionModuleChapterVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 模块卷id */
+	@Excel(name = "模块卷id")
+	@ApiModelProperty("模块卷id")
+	private Long moduleExamId;
+	/** 章卷ID */
+	@Excel(name = "章卷ID")
+	@ApiModelProperty("章卷ID")
+	private Long chapterExamId;
+	/** 排序 */
+	@Excel(name = "排序")
+	@ApiModelProperty("排序")
+	private Long sort;
+}

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

@@ -22,7 +22,7 @@ public class QuestionModuleVo {
 
 	/** 题模块ID */
 	@ApiModelProperty("题模块ID")
-	private Long questionModuleId;
+	private Long moduleExamId;
 
 	/** 前缀名称 */
 	@Excel(name = "前缀名称")

zhongzheng-system/src/main/resources/mapper/modules/bank/QuestionModuleChapterMapper.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.QuestionModuleChapterMapper">
+
+    <resultMap type="com.zhongzheng.modules.bank.domain.QuestionModuleChapter" id="QuestionModuleChapterResult">
+        <result property="id" column="id"/>
+        <result property="moduleExamId" column="module_exam_id"/>
+        <result property="chapterExamId" column="chapter_exam_id"/>
+        <result property="sort" column="sort"/>
+    </resultMap>
+
+
+</mapper>

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

@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zhongzheng.modules.bank.mapper.QuestionModuleMapper">
 
     <resultMap type="com.zhongzheng.modules.bank.domain.QuestionModule" id="QuestionModuleResult">
-        <result property="questionModuleId" column="question_module_id"/>
+        <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"/>