fix 试卷题目

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

@@ -38,7 +38,7 @@ public class ExamQuestionEditBo {
     /** 分值 */
     @ApiModelProperty("分值")
     private BigDecimal score;
-    
+
     /** 多选 每项部分分，默认0分则不开启 */
     @ApiModelProperty("多选 每项部分分，默认0分则不开启")
     private BigDecimal partScore;

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

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.bank.bo;
 
+import com.zhongzheng.modules.course.bo.CourseChapterBusinessAddBo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -54,21 +55,12 @@ public class QuestionAddBo {
     /** 发布状态 1发布 0未发布 */
     @ApiModelProperty("发布状态 1发布 0未发布")
     private Integer publishStatus;
-    /** 教育类型ID */
-    @ApiModelProperty("教育类型ID")
-    private Long educationTypeId;
-    /** 业务层次id */
-    @ApiModelProperty("业务层次id")
-    private Long businessId;
-    /** 科目id */
-    @ApiModelProperty("科目id")
-    private Long subjectId;
-    /** 项目ID */
-    @ApiModelProperty("项目ID")
-    private Long projectId;
     /** 编码 */
     @ApiModelProperty("编码")
     private String code;
     @ApiModelProperty("选项列表")
     private List<QuestionChildAddBo> optionsList;
+    /** 业务层级列表 */
+    @ApiModelProperty("业务层级列表")
+    private List<QuestionBusinessAddBo> businessList;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionBusinessAddBo.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;
+
+
+
+/**
+ * 题目业务层次关系添加对象 question_business
+ *
+ * @author hjl
+ * @date 2021-10-25
+ */
+@Data
+@ApiModel("题目业务层次关系添加对象")
+public class QuestionBusinessAddBo {
+
+    /** 教育类型id */
+    @ApiModelProperty("教育类型id")
+    private Long educationTypeId;
+    /** 业务层次id */
+    @ApiModelProperty("业务层次id")
+    private Long businessId;
+    /** 项目ID */
+    @ApiModelProperty("项目ID")
+    private Long projectId;
+    /** 科目id */
+    @ApiModelProperty("科目id")
+    private Long subjectId;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long questionId;
+}

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

@@ -0,0 +1,45 @@
+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_business
+ *
+ * @author hjl
+ * @date 2021-10-25
+ */
+@Data
+@ApiModel("题目业务层次关系编辑对象")
+public class QuestionBusinessEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 教育类型id */
+    @ApiModelProperty("教育类型id")
+    private Long educationTypeId;
+
+    /** 业务层次id */
+    @ApiModelProperty("业务层次id")
+    private Long businessId;
+
+
+    /** 项目ID */
+    @ApiModelProperty("项目ID")
+    private Long projectId;
+
+    /** 科目id */
+    @ApiModelProperty("科目id")
+    private Long subjectId;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long questionId;
+
+}

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

@@ -0,0 +1,54 @@
+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_business
+ *
+ * @author hjl
+ * @date 2021-10-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("题目业务层次关系分页查询对象")
+public class QuestionBusinessQueryBo 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 educationTypeId;
+	/** 业务层次id */
+	@ApiModelProperty("业务层次id")
+	private Long businessId;
+	/** 项目ID */
+	@ApiModelProperty("项目ID")
+	private Long projectId;
+	/** 科目id */
+	@ApiModelProperty("科目id")
+	private Long subjectId;
+	/** $column.columnComment */
+	@ApiModelProperty("$column.columnComment")
+	private Long questionId;
+}

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

@@ -67,22 +67,6 @@ public class QuestionEditBo {
     @ApiModelProperty("发布状态 1发布 0未发布")
     private Integer publishStatus;
 
-    /** 教育类型ID */
-    @ApiModelProperty("教育类型ID")
-    private Long educationTypeId;
-
-    /** 业务层次id */
-    @ApiModelProperty("业务层次id")
-    private Long businessId;
-
-    /** 科目id */
-    @ApiModelProperty("科目id")
-    private Long subjectId;
-
-    /** 项目ID */
-    @ApiModelProperty("项目ID")
-    private Long projectId;
-
     /** 编码 */
     @ApiModelProperty("编码")
     private String code;
@@ -90,4 +74,8 @@ public class QuestionEditBo {
     @ApiModelProperty("选项列表")
     private List<QuestionChildAddBo> optionsList;
 
+    /** 业务层级列表 */
+    @ApiModelProperty("业务层级列表")
+    private List<QuestionBusinessEditBo> businessList;
+
 }

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

@@ -0,0 +1,39 @@
+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_business
+ *
+ * @author hjl
+ * @date 2021-10-25
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("question_business")
+public class QuestionBusiness implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 教育类型id */
+    private Long educationTypeId;
+    /** 业务层次id */
+    private Long businessId;
+    /** 项目ID */
+    private Long projectId;
+    /** 科目id */
+    private Long subjectId;
+    /** $column.columnComment */
+    private Long questionId;
+}

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

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.bank.mapper;
+
+import com.zhongzheng.modules.bank.domain.QuestionBusiness;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 题目业务层次关系Mapper接口
+ *
+ * @author hjl
+ * @date 2021-10-25
+ */
+public interface QuestionBusinessMapper extends BaseMapper<QuestionBusiness> {
+
+}

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

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.bank.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.bank.bo.QuestionBusinessAddBo;
+import com.zhongzheng.modules.bank.bo.QuestionBusinessEditBo;
+import com.zhongzheng.modules.bank.bo.QuestionBusinessQueryBo;
+import com.zhongzheng.modules.bank.domain.QuestionBusiness;
+import com.zhongzheng.modules.bank.vo.QuestionBusinessVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 题目业务层次关系Service接口
+ *
+ * @author hjl
+ * @date 2021-10-25
+ */
+public interface IQuestionBusinessService extends IService<QuestionBusiness> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	QuestionBusinessVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<QuestionBusinessVo> queryList(QuestionBusinessQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入题目业务层次关系
+	 * @param bo 题目业务层次关系新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(QuestionBusinessAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改题目业务层次关系
+	 * @param bo 题目业务层次关系编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(QuestionBusinessEditBo 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/ExamServiceImpl.java

@@ -129,7 +129,6 @@ public class ExamServiceImpl extends ServiceImpl<ExamMapper, Exam> implements IE
                 addItem.setQuestionId(item.getQuestionId());
                 addItem.setSort(item.getSort());
                 coll.add(addItem);
-
             }
             iExamQuestionService.saveBatch(coll);
         }

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

@@ -0,0 +1,100 @@
+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.QuestionBusinessAddBo;
+import com.zhongzheng.modules.bank.bo.QuestionBusinessEditBo;
+import com.zhongzheng.modules.bank.bo.QuestionBusinessQueryBo;
+import com.zhongzheng.modules.bank.domain.QuestionBusiness;
+import com.zhongzheng.modules.bank.mapper.QuestionBusinessMapper;
+import com.zhongzheng.modules.bank.service.IQuestionBusinessService;
+import com.zhongzheng.modules.bank.vo.QuestionBusinessVo;
+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-25
+ */
+@Service
+public class QuestionBusinessServiceImpl extends ServiceImpl<QuestionBusinessMapper, QuestionBusiness> implements IQuestionBusinessService {
+
+    @Override
+    public QuestionBusinessVo queryById(Long id){
+        QuestionBusiness db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, QuestionBusinessVo.class);
+    }
+
+    @Override
+    public List<QuestionBusinessVo> queryList(QuestionBusinessQueryBo bo) {
+        LambdaQueryWrapper<QuestionBusiness> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getEducationTypeId() != null, QuestionBusiness::getEducationTypeId, bo.getEducationTypeId());
+        lqw.eq(bo.getBusinessId() != null, QuestionBusiness::getBusinessId, bo.getBusinessId());
+        lqw.eq(bo.getProjectId() != null, QuestionBusiness::getProjectId, bo.getProjectId());
+        lqw.eq(bo.getSubjectId() != null, QuestionBusiness::getSubjectId, bo.getSubjectId());
+        lqw.eq(bo.getQuestionId() != null, QuestionBusiness::getQuestionId, bo.getQuestionId());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<QuestionBusinessVo> entity2Vo(Collection<QuestionBusiness> collection) {
+        List<QuestionBusinessVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, QuestionBusinessVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<QuestionBusiness> page = (Page<QuestionBusiness>)collection;
+            Page<QuestionBusinessVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(QuestionBusinessAddBo bo) {
+        QuestionBusiness add = BeanUtil.toBean(bo, QuestionBusiness.class);
+        validEntityBeforeSave(add);
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(QuestionBusinessEditBo bo) {
+        QuestionBusiness update = BeanUtil.toBean(bo, QuestionBusiness.class);
+        validEntityBeforeSave(update);
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(QuestionBusiness 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/QuestionServiceImpl.java

@@ -5,21 +5,27 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.modules.bank.bo.QuestionAddBo;
-import com.zhongzheng.modules.bank.bo.QuestionEditBo;
-import com.zhongzheng.modules.bank.bo.QuestionQueryBo;
+import com.zhongzheng.modules.bank.bo.*;
 import com.zhongzheng.modules.bank.domain.Question;
+import com.zhongzheng.modules.bank.domain.QuestionBusiness;
 import com.zhongzheng.modules.bank.mapper.QuestionMapper;
+import com.zhongzheng.modules.bank.service.IQuestionBusinessService;
 import com.zhongzheng.modules.bank.service.IQuestionService;
 import com.zhongzheng.modules.bank.vo.QuestionVo;
+import com.zhongzheng.modules.course.bo.CourseChapterSectionListAddBo;
+import com.zhongzheng.modules.course.domain.CourseChapterSection;
+import com.zhongzheng.modules.course.service.ICourseChapterSectionService;
+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;
 
@@ -32,6 +38,10 @@ import java.util.stream.Collectors;
 @Service
 public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> implements IQuestionService {
 
+    @Autowired
+    private IQuestionBusinessService iQuestionBusinessService;
+
+
     @Override
     public QuestionVo queryById(Long questionId){
         Question db = this.baseMapper.selectById(questionId);
@@ -79,6 +89,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean insertByAddBo(QuestionAddBo bo) {
         Question add = BeanUtil.toBean(bo, Question.class);
         add.setCode(ServletUtils.getEncoded("TM"));
@@ -88,10 +99,22 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
-        return this.save(add);
+        boolean result = this.save(add);
+        if(bo.getBusinessList()!=null){
+            Collection<QuestionBusiness> coll = new HashSet<>();
+            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());
+                coll.add(addItem);
+            }
+            iQuestionBusinessService.saveBatch(coll);
+        }
+        return result;
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByEditBo(QuestionEditBo bo) {
         Question update = BeanUtil.toBean(bo, Question.class);
         if(bo.getOptionsList()!=null){
@@ -99,6 +122,17 @@ 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()));
+            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());
+                coll.add(addItem);
+            }
+            iQuestionBusinessService.saveBatch(coll);
+        }
         return this.updateById(update);
     }
 

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

@@ -0,0 +1,47 @@
+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-25
+ */
+@Data
+@ApiModel("题目业务层次关系视图对象")
+public class QuestionBusinessVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 教育类型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 projectId;
+	/** 科目id */
+	@Excel(name = "科目id")
+	@ApiModelProperty("科目id")
+	private Long subjectId;
+	/** $column.columnComment */
+	@Excel(name = "科目id")
+	@ApiModelProperty("$column.columnComment")
+	private Long questionId;
+}

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

@@ -0,0 +1,17 @@
+<?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.QuestionBusinessMapper">
+
+    <resultMap type="com.zhongzheng.modules.bank.domain.QuestionBusiness" id="QuestionBusinessResult">
+        <result property="id" column="id"/>
+        <result property="educationTypeId" column="education_type_id"/>
+        <result property="businessId" column="business_id"/>
+        <result property="projectId" column="project_id"/>
+        <result property="subjectId" column="subject_id"/>
+        <result property="questionId" column="question_id"/>
+    </resultMap>
+
+
+</mapper>