fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/CertificateTpServiceImpl.java

@@ -161,6 +161,7 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
             throw new CustomException("数据错误");
         }
         GoodsVo goodsVo = iGoodsService.selectDetail(bo.getGoodsId());
+
         //获取培训开始时间
         UserStudyRecordQueryBo studyRecordQueryBo = new UserStudyRecordQueryBo();
         studyRecordQueryBo.setUserId(bo.getUserId());

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

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.course.bo;
 
+import com.zhongzheng.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -81,7 +82,16 @@ public class CourseAddBo {
     /** 优选生成 0否 1是 */
     @ApiModelProperty("优选生成 0否 1是")
     private Integer firstChoice;
-    /** 证书专业名称 */
-    @ApiModelProperty("证书专业名称")
-    private String certificateMajorName;
+    /** 证书类型ID */
+    @Excel(name = "证书类型ID")
+    @ApiModelProperty("证书类型ID")
+    private Long certificateTypeId;
+    /** 证书ID */
+    @Excel(name = "证书ID")
+    @ApiModelProperty("证书ID")
+    private Long certificateId;
+    /** 证书模板ID */
+    @Excel(name = "证书模板ID")
+    @ApiModelProperty("证书模板ID")
+    private Long certificateTpId;
 }

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

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.course.bo;
 
+import com.zhongzheng.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -99,7 +100,16 @@ public class CourseEditBo {
     /** 优选生成 0否 1是 */
     @ApiModelProperty("优选生成 0否 1是")
     private Integer firstChoice;
-    /** 证书专业名称 */
-    @ApiModelProperty("证书专业名称")
-    private String certificateMajorName;
+    /** 证书类型ID */
+    @Excel(name = "证书类型ID")
+    @ApiModelProperty("证书类型ID")
+    private Long certificateTypeId;
+    /** 证书ID */
+    @Excel(name = "证书ID")
+    @ApiModelProperty("证书ID")
+    private Long certificateId;
+    /** 证书模板ID */
+    @Excel(name = "证书模板ID")
+    @ApiModelProperty("证书模板ID")
+    private Long certificateTpId;
 }

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

@@ -74,7 +74,11 @@ private static final long serialVersionUID=1L;
     private Long oId;
     /** 优选生成 0否 1是 */
     private Integer firstChoice;
-    /** 证书专业名称 */
-    private String certificateMajorName;
+    /** 证书类型ID */
+    private Long certificateTypeId;
+    /** 证书ID */
+    private Long certificateId;
+    /** 证书模板ID */
+    private Long certificateTpId;
 
 }

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

@@ -121,8 +121,16 @@ public class CourseVo {
 	@Excel(name = "优选生成 0否 1是")
 	@ApiModelProperty("优选生成 0否 1是")
 	private Integer firstChoice;
-	/** 证书专业名称 */
-	@Excel(name = "证书专业名称")
-	@ApiModelProperty("证书专业名称")
-	private String certificateMajorName;
+	/** 证书类型ID */
+	@Excel(name = "证书类型ID")
+	@ApiModelProperty("证书类型ID")
+	private Long certificateTypeId;
+	/** 证书ID */
+	@Excel(name = "证书ID")
+	@ApiModelProperty("证书ID")
+	private Long certificateId;
+	/** 证书模板ID */
+	@Excel(name = "证书模板ID")
+	@ApiModelProperty("证书模板ID")
+	private Long certificateTpId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeUserQueryBo.java

@@ -304,4 +304,8 @@ public class ClassGradeUserQueryBo extends BaseEntity {
 
 	private List<WeekDataVo> weekList;
 
+	@ApiModelProperty("1单证书 2多证书")
+	private Integer moreCertificateStatus;
+
+
 }

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

@@ -27,7 +27,9 @@
         <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"/>
+        <result property="certificateTypeId" column="certificate_type_id"/>
+        <result property="certificateId" column="certificate_id"/>
+        <result property="certificateTpId" column="certificate_tp_id"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.course.vo.CourseVo" id="CourseResultVo">
@@ -59,7 +61,9 @@
         <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"/>
+        <result property="certificateTypeId" column="certificate_type_id"/>
+        <result property="certificateId" column="certificate_id"/>
+        <result property="certificateTpId" column="certificate_tp_id"/>
         <collection property="goodsList" column="course_id" select="findGoodsList"/>
     </resultMap>
 

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml

@@ -1550,6 +1550,9 @@
                 LEFT JOIN goods_course gc ON gc.course_id = m.course_id
         WHERE
             gc.goods_id = #{goodsId}
+            <if test="courseId != null and moreCertificateStatus == 2 ">
+                AND gc.course_id = #{courseId}
+            </if>
           AND m.type =  2)ui
         ORDER BY ui.sort
     </select>