Browse Source

fix 学时

he2802 3 years ago
parent
commit
28ac15cb6a

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassGradeStudentVo.java

@@ -157,4 +157,6 @@ public class ClassGradeStudentVo {
 	/** 是否学时推送 0未推送 1推送 */
 	/** 是否学时推送 0未推送 1推送 */
 	@ApiModelProperty("是否学时推送 0未推送 1推送")
 	@ApiModelProperty("是否学时推送 0未推送 1推送")
 	private Integer periodPlush;
 	private Integer periodPlush;
+	@ApiModelProperty("官方学时推送次数")
+	private Integer periodStatusNum;
 }
 }

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

@@ -98,7 +98,7 @@
         <result property="keyValue" column="key_value"/>
         <result property="keyValue" column="key_value"/>
         <result property="classStartTime" column="class_start_time"/>
         <result property="classStartTime" column="class_start_time"/>
         <result property="classEndTime" column="class_end_time"/>
         <result property="classEndTime" column="class_end_time"/>
-
+        <result property="periodStatusNum" column="period_status_num"/>
     </resultMap>
     </resultMap>
 
 
     <resultMap type="com.zhongzheng.modules.grade.vo.ClassPeriodUserVo" id="ClassPeriodUserVo">
     <resultMap type="com.zhongzheng.modules.grade.vo.ClassPeriodUserVo" id="ClassPeriodUserVo">
@@ -300,6 +300,7 @@
         cg.class_end_time,
         cg.class_end_time,
         cg.class_name,
         cg.class_name,
         cgu.period_plush,
         cgu.period_plush,
+        cgu.period_status_num,
         IFNULL(ge.exam_num,0) as exam_num,
         IFNULL(ge.exam_num,0) as exam_num,
         <if test="userPhoto != null and userPhoto == 1">
         <if test="userPhoto != null and userPhoto == 1">
         up.key_value,
         up.key_value,