fix 试卷题目

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

@@ -45,7 +45,7 @@ public class QuestionChapterAddBo {
     private String code;
     /** 业务层级列表 */
     @ApiModelProperty("业务层级列表")
-    private List<QuestionChapterBusinessAddBo> businessList;
+    private List<QuestionBusinessAddBo> businessList;
     @ApiModelProperty("节id列表")
     private List<QuestionChapterExamAddBo> examList;
 }

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

@@ -1,36 +0,0 @@
-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_business
- *
- * @author hjl
- * @date 2021-10-25
- */
-@Data
-@ApiModel("题目章卷业务层次关系添加对象")
-public class QuestionChapterBusinessAddBo {
-
-    /** 教育类型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 chapterExamId;
-}

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

@@ -1,45 +0,0 @@
-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_business
- *
- * @author hjl
- * @date 2021-10-25
- */
-@Data
-@ApiModel("题目章卷业务层次关系编辑对象")
-public class QuestionChapterBusinessEditBo {
-
-    /** $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 chapterExamId;
-
-}

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

@@ -1,54 +0,0 @@
-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_business
- *
- * @author hjl
- * @date 2021-10-25
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel("题目章卷业务层次关系分页查询对象")
-public class QuestionChapterBusinessQueryBo 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 chapterExamId;
-}

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

@@ -53,7 +53,7 @@ public class QuestionChapterEditBo {
 
     /** 业务层级列表 */
     @ApiModelProperty("业务层级列表")
-    private List<QuestionChapterBusinessEditBo> businessList;
+    private List<QuestionBusinessEditBo> businessList;
     @ApiModelProperty("节id列表")
     private List<QuestionChapterExamEditBo> examList;
 

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

@@ -23,7 +23,9 @@ public class QuestionBusiness implements Serializable {
 
 private static final long serialVersionUID=1L;
 
-
+    public static final int TYPE_QUESTION = 1;
+    public static final int TYPE_EXAM = 2;
+    public static final int TYPE_QUESTION_CHAPTER = 3;
 
     /** $column.columnComment */
     @TableId(value = "id")

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

@@ -1,39 +0,0 @@
-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_business
- *
- * @author hjl
- * @date 2021-10-25
- */
-@Data
-@NoArgsConstructor
-@Accessors(chain = true)
-@TableName("question_chapter_business")
-public class QuestionChapterBusiness 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 chapterExamId;
-}

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

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

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

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

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

@@ -6,10 +6,8 @@ import com.zhongzheng.common.utils.DateUtils;
 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;
@@ -36,7 +34,7 @@ import java.util.stream.Collectors;
 public class QuestionChapterServiceImpl extends ServiceImpl<QuestionChapterMapper, QuestionChapter> implements IQuestionChapterService {
 
     @Autowired
-    private IQuestionChapterBusinessService iQuestionChapterBusinessService;
+    private IQuestionBusinessService iQuestionBusinessService;
 
     @Override
     public QuestionChapterVo queryById(Long chapterExamId){
@@ -85,14 +83,15 @@ public class QuestionChapterServiceImpl extends ServiceImpl<QuestionChapterMappe
         add.setUpdateTime(DateUtils.getNowTime());
         boolean result = this.save(add);
         if(bo.getBusinessList()!=null){
-            Collection<QuestionChapterBusiness> coll = new HashSet<>();
+            Collection<QuestionBusiness> 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());
+                QuestionBusinessAddBo item = bo.getBusinessList().get(i);
+                QuestionBusiness addItem = BeanUtil.toBean(item,  QuestionBusiness.class);
+                addItem.setMajorId(add.getChapterExamId());
+                addItem.setType(QuestionBusiness.TYPE_QUESTION_CHAPTER);
                 coll.add(addItem);
             }
-            iQuestionChapterBusinessService.saveBatch(coll);
+            iQuestionBusinessService.saveBatch(coll);
         }
         return result;
     }
@@ -104,15 +103,17 @@ public class QuestionChapterServiceImpl extends ServiceImpl<QuestionChapterMappe
         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<>();
+            iQuestionBusinessService.remove(new LambdaQueryWrapper<QuestionBusiness>().eq(QuestionBusiness::getMajorId, bo.getChapterExamId())
+                    .eq(QuestionBusiness::getType,QuestionBusiness.TYPE_QUESTION_CHAPTER));
+            Collection<QuestionBusiness> 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());
+                QuestionBusinessEditBo item = bo.getBusinessList().get(i);
+                QuestionBusiness addItem = BeanUtil.toBean(item,  QuestionBusiness.class);
+                addItem.setMajorId(update.getChapterExamId());
+                addItem.setType(QuestionBusiness.TYPE_QUESTION_CHAPTER);
                 coll.add(addItem);
             }
-            iQuestionChapterBusinessService.saveBatch(coll);
+            iQuestionBusinessService.saveBatch(coll);
         }
         return this.updateById(update);
     }

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

@@ -110,7 +110,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                 QuestionBusinessAddBo item = bo.getBusinessList().get(i);
                 QuestionBusiness addItem = BeanUtil.toBean(item, QuestionBusiness.class);
                 addItem.setMajorId(add.getQuestionId());
-                addItem.setType(1);
+                addItem.setType(QuestionBusiness.TYPE_QUESTION);
                 coll.add(addItem);
             }
             iQuestionBusinessService.saveBatch(coll);
@@ -130,13 +130,13 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
         if(bo.getBusinessList()!=null){
             iQuestionBusinessService.remove(new LambdaQueryWrapper<QuestionBusiness>()
                     .eq(QuestionBusiness::getMajorId, bo.getQuestionId())
-            .eq(QuestionBusiness::getType,1));
+            .eq(QuestionBusiness::getType,QuestionBusiness.TYPE_QUESTION));
             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(bo.getQuestionId());
-                addItem.setType(1);
+                addItem.setType(QuestionBusiness.TYPE_QUESTION);
                 coll.add(addItem);
             }
             iQuestionBusinessService.saveBatch(coll);

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

@@ -1,47 +0,0 @@
-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 QuestionChapterBusinessVo {
-	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 chapterExamId;
-}

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

@@ -41,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
-            type = #{type} and qb.majorId =#{id}
+            type = #{type} and qb.major_id =#{id}
     </select>
 
 </mapper>