he2802 3 سال پیش
والد
کامیت
046d5e2620

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

@@ -366,6 +366,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
             goodsUserVo.setOfficialLearningUrl(classGradeVo.getOfficialLearningUrl());
             goodsUserVo.setOfficialStatus(classGradeVo.getOfficialStatus());
             goodsUserVo.setLearnStatus(classGradeVo.getLearnStatus());
+            goodsUserVo.setPeriodPlush(classGradeVo.getPeriodPlush());
             Long secLong = 0L;
             Long studyLong = 0L;
             SubjectStudyRecordQueryBo subjectStudyRecordQueryBo = new SubjectStudyRecordQueryBo();

+ 4 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsUserVo.java

@@ -350,5 +350,8 @@ public class GoodsUserVo {
 	@Excel(name = "官方信息推送接口")
 	@ApiModelProperty("官方信息推送接口")
 	private Long interfacePushId;
-
+	/** 是否学时推送 0未推送 1推送 */
+	@Excel(name = "是否学时推送 0未推送 1推送")
+	@ApiModelProperty("是否学时推送 0未推送 1推送")
+	private Integer periodPlush;
 }

+ 4 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassGradeVo.java

@@ -158,5 +158,9 @@ public class ClassGradeVo {
 	@Excel(name = "官方学习账号推送状态 0否 1是")
 	@ApiModelProperty("官方学习账号推送状态 0否 1是")
 	private Integer learnStatus;
+	/** 是否学时推送 0未推送 1推送 */
+	@Excel(name = "是否学时推送 0未推送 1推送")
+	@ApiModelProperty("是否学时推送 0未推送 1推送")
+	private Integer periodPlush;
 
 }

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

@@ -216,6 +216,7 @@
         <result property="officialLearningUrl" column="official_learning_url"/>
         <result property="learnStatus" column="learn_status"/>
         <result property="officialStatus" column="official_status"/>
+        <result property="periodPlush" column="period_plush"/>
     </resultMap>
 
 
@@ -575,7 +576,8 @@
             cg.interface_account_id,
             cg.official_learning_url,
             cg.interface_push_id,
-            cgu.official_status
+            cgu.official_status,
+            cgu.period_plush
         FROM
             class_grade_user cgu
                 LEFT JOIN class_grade cg on cgu.grade_id = cg.grade_id