Merge branch 'dev' of http://120.79.166.78:19005/zhongzheng-edu/saas_entrepot into dev

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

@@ -169,4 +169,16 @@ public class ClassGradeVo {
 	@ApiModelProperty("订单商品ID")
 	private Long orderGoodsId;
 
+	/** 报名已推送人数 */
+	@ApiModelProperty("报名已推送人数")
+	private Integer learnStatusNum;
+
+	/** 学时审核通过人数 */
+	@ApiModelProperty("学时审核通过人数")
+	private Integer periodStatusNum;
+
+	/** 学时已推送人数 */
+	@ApiModelProperty("学时已推送人数")
+	private Integer periodPlushNum;
+
 }

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

@@ -50,6 +50,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="interfacePushName" column="interface_push_name"/>
         <result property="studentNum" column="student_num"/>
         <result property="officialLearningUrl" column="official_learning_url"/>
+        <result property="learnStatusNum" column="learn_status_num"/>
+        <result property="periodStatusNum" column="period_status_num"/>
+        <result property="periodPlushNum" column="period_plush_num"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.grade.vo.ClassGradeUserListVo" id="ClassGradeUserListVo">
@@ -171,7 +174,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             (SELECT nick_name FROM sys_user u where g.sys_user_id = u.user_id) as nick_name,
             (SELECT area_name FROM apply_areas a where a.area_id = g.areas_id) as area_name,
             (SELECT area_name FROM apply_areas a where a.area_id = g.city_id) as city_name,
-            (SELECT COUNT(a.id) FROM class_grade_user a where a.grade_id = g.grade_id and a.status =1) as student_num
+            (SELECT COUNT(a.id) FROM class_grade_user a where a.grade_id = g.grade_id and a.status =1) as student_num,
+            (SELECT COUNT(a.id) FROM class_grade_user a where a.grade_id = g.grade_id and a.status =1 and learn_status =1) as learn_status_num,
+            (SELECT COUNT(a.id) FROM class_grade_user a where a.grade_id = g.grade_id and a.status =1 and period_status =1) as period_status_num,
+            (SELECT COUNT(a.id) FROM class_grade_user a where a.grade_id = g.grade_id and a.status =1 and period_plush =1) as period_plush_num
         FROM
             class_grade g
         <if test="userId != null and userId !=0 ">