he2802 1 년 전
부모
커밋
5b831e5c72

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseAddBo.java

@@ -81,4 +81,7 @@ public class CourseAddBo {
     /** 优选生成 0否 1是 */
     @ApiModelProperty("优选生成 0否 1是")
     private Integer firstChoice;
+    /** 证书专业名称 */
+    @ApiModelProperty("证书专业名称")
+    private String certificateMajorName;
 }

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseEditBo.java

@@ -99,4 +99,7 @@ public class CourseEditBo {
     /** 优选生成 0否 1是 */
     @ApiModelProperty("优选生成 0否 1是")
     private Integer firstChoice;
+    /** 证书专业名称 */
+    @ApiModelProperty("证书专业名称")
+    private String certificateMajorName;
 }

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/Course.java

@@ -74,5 +74,7 @@ private static final long serialVersionUID=1L;
     private Long oId;
     /** 优选生成 0否 1是 */
     private Integer firstChoice;
+    /** 证书专业名称 */
+    private String certificateMajorName;
 
 }

+ 4 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseVo.java

@@ -121,4 +121,8 @@ public class CourseVo {
 	@Excel(name = "优选生成 0否 1是")
 	@ApiModelProperty("优选生成 0否 1是")
 	private Integer firstChoice;
+	/** 证书专业名称 */
+	@Excel(name = "证书专业名称")
+	@ApiModelProperty("证书专业名称")
+	private String certificateMajorName;
 }

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

@@ -211,4 +211,7 @@ public class GoodsAddBo {
     /** 优选生成商品 0否 1是 */
     @ApiModelProperty("优选生成商品 0否 1是")
     private Long firstChoiceGoods;
+    /** 1单证书 2多证书 */
+    @ApiModelProperty("1单证书 2多证书")
+    private Integer moreCertificateStatus;
 }

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

@@ -245,4 +245,7 @@ public class GoodsEditBo {
     /** 优选生成商品 0否 1是 */
     @ApiModelProperty("优选生成商品 0否 1是")
     private Long firstChoiceGoods;
+    /** 1单证书 2多证书 */
+    @ApiModelProperty("1单证书 2多证书")
+    private Integer moreCertificateStatus;
 }

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

@@ -176,4 +176,6 @@ private static final long serialVersionUID=1L;
     private Long minClassHour;
     /** 优选生成商品 0否 1是 */
     private Long firstChoiceGoods;
+    /** 1单证书 2多证书 */
+    private Integer moreCertificateStatus;
 }

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

@@ -390,4 +390,8 @@ public class GoodsVo {
 	private Long firstChoiceGoods;
 	@ApiModelProperty("业务别名")
 	private String aliasName;
+	/** 1单证书 2多证书 */
+	@Excel(name = "1单证书 2多证书")
+	@ApiModelProperty("1单证书 2多证书")
+	private Integer moreCertificateStatus;
 }

+ 2 - 0
zhongzheng-system/src/main/resources/mapper/modules/course/CourseMapper.xml

@@ -27,6 +27,7 @@
         <result property="projectId" column="project_id"/>
         <result property="courseShow" column="course_show"/>
         <result property="firstChoice" column="first_choice"/>
+        <result property="certificateMajorName" column="certificate_major_name"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.course.vo.CourseVo" id="CourseResultVo">
@@ -58,6 +59,7 @@
         <result property="subjectName" column="subject_name"/>
         <result property="courseShow" column="course_show"/>
         <result property="firstChoice" column="first_choice"/>
+        <result property="certificateMajorName" column="certificate_major_name"/>
         <collection property="goodsList" column="course_id" select="findGoodsList"/>
     </resultMap>
 

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

@@ -58,6 +58,7 @@
         <result property="firstChoiceStatus" column="first_choice_status"/>
         <result property="minClassHour" column="min_class_hour"/>
         <result property="firstChoiceGoods" column="first_choice_goods"/>
+        <result property="moreCertificateStatus" column="more_certificate_status"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.goods.vo.GoodsVo" id="GoodsResultVo">
@@ -152,6 +153,7 @@
         <result property="minClassHour" column="min_class_hour"/>
         <result property="firstChoiceGoods" column="first_choice_goods"/>
         <result property="aliasName" column="alias_name"/>
+        <result property="moreCertificateStatus" column="more_certificate_status"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.exam.vo.ExamNumberGoodsVo" id="ExamNumberGoodsVoResult">