he2802 2 年之前
父节点
当前提交
cb6107a0ef

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

@@ -230,5 +230,10 @@ public class ClassGradeStudentVo {
 	private Long expendBefore;
 
 	private String sevenYear;
+	@ApiModelProperty("学时推送结果")
+	private String periodPlushMsg;
+
+	@ApiModelProperty("官方信息推送结果")
+	private String officialStatusMsg;
 
 }

+ 4 - 0
zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeMapper.xml

@@ -179,6 +179,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="doNumber" column="do_number"/>
         <result property="expendNumber" column="expend_number"/>
         <result property="expendBefore" column="expend_before"/>
+        <result property="periodPlushMsg" column="official_status_msg"/>
+        <result property="officialStatusMsg" column="period_plush_msg"/>
     </resultMap>
 
 
@@ -417,6 +419,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         cg.class_end_time,
         cg.interface_push_id,
         cgu.official_status,
+        cgu.official_status_msg,
+        cgu.period_plush_msg,
         cgu.learn_status,
         (SELECT COUNT(m.id) FROM course_menu_exam m LEFT JOIN goods_course c on m.course_id=c.course_id LEFT JOIN class_grade_goods cgg on cgg.goods_id = c.goods_id where cg.grade_id=cgg.grade_id and m.type  in (1,3) ) as exam_num,
         (SELECT COUNT(DISTINCT ubr.module_id,ubr.chapter_id,ubr.exam_id) FROM user_bank_record ubr LEFT JOIN class_grade_goods cgg on cgg.goods_id = ubr.goods_id where ubr.`status`=1 and ubr.type  in (1,3) and  ubr.user_id = u.user_id and ubr.grade_id = cgu.grade_id and ubr.report_status=1 and ubr.current_status = 1) as record_num,