change 3 жил өмнө
parent
commit
3deb7ccb10

+ 15 - 3
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassPeriodUserVo.java

@@ -90,14 +90,26 @@ public class ClassPeriodUserVo {
 	private Long recordNum;
 
 	/** 通过节 */
-	@ApiModelProperty("通过节")
+	@ApiModelProperty("視頻通过节")
 	private Long pass;
 
 	/** 作弊节 */
-	@ApiModelProperty("作弊节")
+	@ApiModelProperty("視頻作弊节")
 	private Long cheat;
 
 	/** 待审*/
-	@ApiModelProperty("待审")
+	@ApiModelProperty("視頻待审")
 	private Long pending;
+
+	/** 通过节 */
+	@ApiModelProperty("試卷通过节")
+	private Long examPass;
+
+	/** 作弊节 */
+	@ApiModelProperty("試卷作弊节")
+	private Long examCheat;
+
+	/** 待审*/
+	@ApiModelProperty("試卷待审")
+	private Long examPending;
 }

+ 7 - 1
zhongzheng-system/src/main/resources/mapper/modules/grade/UserPeriodStatusMapper.xml

@@ -33,7 +33,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
         ups.*,
         (select realname from `user` u where up.user_id = u.user_id) as  realname,
-        (SELECT name FROM course_section cs where up.section_id= cs.section_id) as type_name
+        <if test="examId != null ">
+            (SELECT name FROM course_section cs where up.section_id= cs.section_id)
+        </if>
+        <if test="sectionId != null ">
+            (SELECT name FROM course_section cs where up.section_id= cs.section_id)
+        </if>
+         as type_name
         FROM
         user_period_status ups
         LEFT JOIN user_period up ON up.id = ups.period_id