fix

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

@@ -28,11 +28,14 @@ import com.zhongzheng.modules.base.vo.CertificatePhotoVo;
 import com.zhongzheng.modules.base.vo.CertificateTpVo;
 import com.zhongzheng.modules.course.bo.CourseMenuQueryBo;
 import com.zhongzheng.modules.course.mapper.CourseMenuMapper;
+import com.zhongzheng.modules.course.service.ICourseMenuService;
+import com.zhongzheng.modules.course.service.ICourseModuleService;
 import com.zhongzheng.modules.course.vo.CourseChapterVo;
 import com.zhongzheng.modules.course.vo.CourseMenuVo;
 import com.zhongzheng.modules.course.vo.CourseModuleVo;
 import com.zhongzheng.modules.course.vo.CourseVo;
 import com.zhongzheng.modules.goods.bo.GoodsCourseQueryBo;
+import com.zhongzheng.modules.goods.service.IGoodsCourseService;
 import com.zhongzheng.modules.goods.service.IGoodsService;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
 import com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo;
@@ -90,6 +93,15 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
     @Autowired
     private CourseMenuMapper courseMenuMapper;
 
+    @Autowired
+    private IGoodsCourseService iGoodsCourseService;
+
+    @Autowired
+    private ICourseMenuService iCourseMenuService;
+
+    @Autowired
+    private ICourseModuleService iCourseModuleService;
+
     @Value("${certificate.host}")
     private String CERTIFICATE_HOST;
 

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

@@ -55,4 +55,13 @@ public class CourseModuleAddBo {
     private Long freeExamId;
     @ApiModelProperty("公共标识：1公共章 0非公共章")
     private Integer commonSign;
+    /** 证书类型ID */
+    @ApiModelProperty("证书类型ID")
+    private Long certificateTypeId;
+    /** 证书ID */
+    @ApiModelProperty("证书ID")
+    private Long certificateId;
+    /** 证书模板ID */
+    @ApiModelProperty("证书模板ID")
+    private Long certificateTpId;
 }

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

@@ -64,4 +64,13 @@ public class CourseModuleEditBo {
     private Long freeExamId;
     @ApiModelProperty("公共标识：1公共章 0非公共章")
     private Integer commonSign;
+    /** 证书类型ID */
+    @ApiModelProperty("证书类型ID")
+    private Long certificateTypeId;
+    /** 证书ID */
+    @ApiModelProperty("证书ID")
+    private Long certificateId;
+    /** 证书模板ID */
+    @ApiModelProperty("证书模板ID")
+    private Long certificateTpId;
 }

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

@@ -53,5 +53,10 @@ private static final long serialVersionUID=1L;
     private Long oId;
     /** 公共标识：1公共章 0非公共章 */
     private String commonSign;
-
+    /** 证书类型ID */
+    private Long certificateTypeId;
+    /** 证书ID */
+    private Long certificateId;
+    /** 证书模板ID */
+    private Long certificateTpId;
 }

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;
 }

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;
 }

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;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserCertificateAddBo.java

@@ -79,4 +79,10 @@ public class UserCertificateAddBo {
     /** 章名,拼接 */
     @ApiModelProperty("章名,拼接")
     private String chapterStr;
+    /** 模块id */
+    @ApiModelProperty("模块id")
+    private Long moduleId;
+    /** 1单证书 2多证书 */
+    @ApiModelProperty("1单证书 2多证书")
+    private Integer moreCertificateStatus;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserCertificateEditBo.java

@@ -88,4 +88,10 @@ public class UserCertificateEditBo {
     /** 章名,拼接 */
     @ApiModelProperty("章名,拼接")
     private String chapterStr;
+    /** 模块id */
+    @ApiModelProperty("模块id")
+    private Long moduleId;
+    /** 1单证书 2多证书 */
+    @ApiModelProperty("1单证书 2多证书")
+    private Integer moreCertificateStatus;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserCertificate.java

@@ -66,4 +66,8 @@ private static final long serialVersionUID=1L;
     private String pushDate;
     /** 章名,拼接 */
     private String chapterStr;
+    /** 模块id */
+    private Long moduleId;
+    /** 1单证书 2多证书 */
+    private Integer moreCertificateStatus;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserCertificateVo.java

@@ -114,8 +114,12 @@ public class UserCertificateVo {
 	@Excel(name = "章名,拼接")
 	@ApiModelProperty("章名,拼接")
 	private String chapterStr;
-	/** 课程id */
+	/** 模块id */
+	@Excel(name = "模块id")
+	@ApiModelProperty("模块id")
 	private Long moduleId;
 	/** 1单证书 2多证书 */
+	@Excel(name = "1单证书 2多证书")
+	@ApiModelProperty("1单证书 2多证书")
 	private Integer moreCertificateStatus;
 }

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

@@ -17,6 +17,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="examType" column="exam_type"/>
         <result property="freeExamId" column="free_exam_id"/>
         <result property="commonSign" column="common_sign"/>
+        <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.CourseModuleVo" id="CourseModuleResultVo">
@@ -36,6 +39,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="freeExamId" column="free_exam_id"/>
         <result property="freeExamName" column="free_exam_name"/>
         <result property="commonSign" column="common_sign"/>
+        <result property="certificateTypeId" column="certificate_type_id"/>
+        <result property="certificateId" column="certificate_id"/>
+        <result property="certificateTpId" column="certificate_tp_id"/>
         <collection property="businessList" column="module_id" select="findBusinessList" />
         <collection property="courseList" column="module_id" select="findCourseList"/>
     </resultMap>

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">

zhongzheng-system/src/main/resources/mapper/modules/user/UserCertificateMapper.xml

@@ -25,6 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="year" column="year"/>
         <result property="pushDate" column="push_date"/>
         <result property="chapterStr" column="chapter_str"/>
+        <result property="moduleId" column="module_id"/>
+        <result property="moreCertificateStatus" column="more_certificate_status"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.user.vo.UserCertificateVo" id="UserCertificateVoResult">
@@ -55,6 +57,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="certificateName" column="certificate_name"/>
         <result property="keyValue" column="key_value"/>
         <result property="chapterStr" column="chapter_str"/>
+        <result property="moduleId" column="module_id"/>
+        <result property="moreCertificateStatus" column="more_certificate_status"/>
     </resultMap>
 
     <select id="selectMaxId"   resultType="Long">