he2802 2 жил өмнө
parent
commit
2f1ae26153

+ 1 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseServiceImpl.java

@@ -467,6 +467,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
             goodsUserVo.setLearnStatus(classGradeVo.getLearnStatus());
             goodsUserVo.setPeriodPlush(classGradeVo.getPeriodPlush());
             goodsUserVo.setOfficialName(classGradeVo.getOfficialName());
+            goodsUserVo.setPeriodWaitTime(classGradeVo.getPeriodWaitTime());
             Long secLong = 0L;
             Long studyLong = 0L;
             SubjectStudyRecordQueryBo subjectStudyRecordQueryBo = new SubjectStudyRecordQueryBo();

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsUserVo.java

@@ -391,4 +391,7 @@ public class GoodsUserVo {
 	private String externalLink;
 	@ApiModelProperty("是否外链商品:0否 1是")
 	private Integer externalLinkStatus;
+	@Excel(name = "学时变为待审核时间")
+	@ApiModelProperty("学时变为待审核时间")
+	private Long periodWaitTime;
 }

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

@@ -248,6 +248,7 @@
         <result property="orderGoodsId" column="order_goods_id"/>
         <result property="officialName" column="official_name"/>
         <result property="userId" column="user_id"/>
+        <result property="periodWaitTime" column="period_wait_time"/>
     </resultMap>
 
 
@@ -671,7 +672,8 @@
             cgu.official_status,
             cgu.period_plush,
             cgu.order_goods_id,
-            cg.official_name
+            cg.official_name,
+            cgu.period_wait_time
         FROM
             class_grade_user cgu
                 LEFT JOIN class_grade cg on cgu.grade_id = cg.grade_id