fix 试做配置

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsAddBo.java

@@ -118,4 +118,5 @@ public class GoodsAddBo {
     @ApiModelProperty("拍照设置")
     private GoodsPhotographConfigAddBo photographConfig;
 
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsBankAddBo.java

@@ -106,4 +106,6 @@ public class GoodsBankAddBo {
     private Integer projectId;
     @ApiModelProperty("题库列表")
     private List<GoodsAttachedAddBo> bankList;
+    @ApiModelProperty("试卷试做配置列表")
+    private List<GoodsExamConfigAddBo> examConfigList;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsBankEditBo.java

@@ -132,5 +132,6 @@ public class GoodsBankEditBo {
     @ApiModelProperty("题库列表")
     private List<GoodsAttachedEditBo> bankList;
 
-
+    @ApiModelProperty("试卷试做配置列表")
+    private List<GoodsExamConfigAddBo> examConfigList;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsEditBo.java

@@ -146,4 +146,6 @@ public class GoodsEditBo {
     private GoodsPhotographConfigAddBo photographConfig;
 
 
+
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsExamConfigAddBo.java

@@ -0,0 +1,38 @@
+package com.zhongzheng.modules.goods.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 试卷试做设置添加对象 goods_question_config
+ *
+ * @author hjl
+ * @date 2021-11-02
+ */
+@Data
+@ApiModel("试卷试做设置添加对象")
+public class GoodsExamConfigAddBo {
+
+
+    /** $column.columnComment */
+    @ApiModelProperty("试卷id")
+    private Long examId;
+
+    /** 章卷ID */
+    @ApiModelProperty("章卷ID")
+    private Long chapterExamId;
+
+    /** 题模块ID */
+    @ApiModelProperty("题模块ID")
+    private Long moduleExamId;
+
+    /** 试做题目数 */
+    @ApiModelProperty("试做题目数")
+    private Integer num;
+
+
+
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/domain/Goods.java

@@ -96,4 +96,6 @@ private static final long serialVersionUID=1L;
     private String goodsPhotographConfig;
     /** 播放设置 */
     private String goodsPlayConfig;
+    /** 试卷试做设置 */
+    private String goodsExamConfig;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsServiceImpl.java

@@ -18,10 +18,7 @@ import com.zhongzheng.modules.goods.service.IGoodsAttachedService;
 import com.zhongzheng.modules.goods.service.IGoodsAuditionConfigService;
 import com.zhongzheng.modules.goods.service.IGoodsCourseService;
 import com.zhongzheng.modules.goods.service.IGoodsService;
-import com.zhongzheng.modules.goods.vo.GoodsAuditionConfigVo;
-import com.zhongzheng.modules.goods.vo.GoodsPhotographConfigVo;
-import com.zhongzheng.modules.goods.vo.GoodsPlayConfigVo;
-import com.zhongzheng.modules.goods.vo.GoodsVo;
+import com.zhongzheng.modules.goods.vo.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -70,6 +67,10 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         if(db.getGoodsPhotographConfig()!=null){
             goodsVo.setGoodsPhotographConfigVo(JSON.parseObject(db.getGoodsPhotographConfig(), GoodsPhotographConfigVo.class));
         }
+        //试卷试做配置
+        if(db.getGoodsExamConfig()!=null){
+            goodsVo.setExamConfigList(JSON.parseArray(db.getGoodsExamConfig(), GoodsExamConfigVo.class));
+        }
         return goodsVo;
     }
 
@@ -175,6 +176,10 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
+        //试卷试做设置列表
+        if(bo.getExamConfigList()!=null){
+            add.setGoodsExamConfig(JSON.toJSONString(bo.getExamConfigList()));
+        }
         boolean result = this.save(add);
         if(bo.getBankList()!=null){
             Collection<GoodsAttached> coll = new HashSet<>();
@@ -245,6 +250,10 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
             }
             iGoodsAttachedService.saveBatch(coll);
         }
+        //试卷试做设置列表
+        if(bo.getExamConfigList()!=null&&bo.getExamConfigList().size()>0){
+            update.setGoodsExamConfig(JSON.toJSONString(bo.getExamConfigList()));
+        }
         return this.updateById(update);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsExamConfigVo.java

@@ -0,0 +1,36 @@
+package com.zhongzheng.modules.goods.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 商品试做配置视图对象 mall_package
+ *
+ * @author hjl
+ * @date 2021-11-02
+ */
+@Data
+@ApiModel("商品试做配置视图对象")
+public class GoodsExamConfigVo {
+	private static final long serialVersionUID = 1L;
+
+
+	/** $column.columnComment */
+	@ApiModelProperty("试卷id")
+	private Long examId;
+
+	/** 章卷ID */
+	@ApiModelProperty("章卷ID")
+	private Long chapterExamId;
+
+	/** 题模块ID */
+	@ApiModelProperty("题模块ID")
+	private Long moduleExamId;
+
+	/** 试做题目数 */
+	@ApiModelProperty("试做题目数")
+	private Integer num;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsVo.java

@@ -175,4 +175,7 @@ public class GoodsVo {
 
 	@ApiModelProperty("拍照设置")
 	private GoodsPhotographConfigVo goodsPhotographConfigVo;
+
+	@ApiModelProperty("试卷试做配置列表")
+	private List<GoodsExamConfigVo> examConfigList;
 }

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsMapper.xml

@@ -39,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="goodsAuditionConfig" column="goods_audition_config"/>
         <result property="goodsPhotographConfig" column="goods_photograph_config"/>
         <result property="goodsPlayConfig" column="goods_play_config"/>
+        <result property="goodsExamConfig" column="goods_exam_config"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.goods.vo.GoodsVo" id="GoodsResultVo">
@@ -75,6 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="goodsAuditionConfig" column="goods_audition_config"/>
         <result property="goodsPhotographConfig" column="goods_photograph_config"/>
         <result property="goodsPlayConfig" column="goods_play_config"/>
+        <result property="goodsExamConfig" column="goods_exam_config"/>
 
         <result property="supplyName" column="supply_name"/>
         <result property="educationName" column="education_name"/>