yangdamao 2 лет назад
Родитель
Сommit
d37164bf22

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

@@ -160,4 +160,8 @@ public class GoodsPeriodVo {
 	@Excel(name = "考试列表")
 	@ApiModelProperty("考试列表")
 	private List<ExamApplyGoodsVo> examApplyGoodsList;
+	@ApiModelProperty("外链")
+	private String externalLink;
+	@ApiModelProperty("是否外链商品:0否 1是")
+	private Integer externalLinkStatus;
 }

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserMockRecordAddBo.java

@@ -89,4 +89,6 @@ public class UserMockRecordAddBo {
     /** 模拟做题试卷ID */
     @ApiModelProperty("模拟做题试卷ID")
     private Long simulateExamId;
+    @ApiModelProperty("订单商品ID")
+    private Long orderGoodsId;
 }

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserMockRecordEditBo.java

@@ -105,4 +105,6 @@ public class UserMockRecordEditBo {
     /** 模拟做题试卷ID */
     @ApiModelProperty("模拟做题试卷ID")
     private Long simulateExamId;
+    @ApiModelProperty("订单商品ID")
+    private Long orderGoodsId;
 }

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserMockRecord.java

@@ -80,5 +80,7 @@ private static final long serialVersionUID=1L;
     private Integer doMode;
     /** 模拟做题试卷ID */
     private Long simulateExamId;
+    /** 模拟做题试卷ID */
+    private Long orderGoodsId;
 
 }

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

@@ -110,6 +110,8 @@
         <result property="serviceEndTime" column="service_end_time"/>
         <result property="classStartTime" column="class_start_time"/>
         <result property="classEndTime" column="class_end_time"/>
+        <result property="externalLink" column="external_link"/>
+        <result property="externalLinkStatus" column="external_link_status"/>
 
         <result property="learningStatus" column="learning_status"/>
         <result property="classStatus" column="class_status"/>
@@ -446,7 +448,9 @@
             cet.education_name,
             cpt.project_name,
             cb.business_name,
-            cg.official_name
+            cg.official_name,
+            g.external_link,
+            g.external_link_status
         FROM
             class_grade_user cgu
                 LEFT JOIN class_grade_goods cgg ON cgu.grade_id = cgg.grade_id