搜索条件新增

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

@@ -112,4 +112,7 @@ public class ClassPeriodUserVo {
 	/** 待审*/
 	@ApiModelProperty("試卷待审")
 	private Long examPending;
+
+	@ApiModelProperty("审核资料")
+	private String keyValue;
 }

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

@@ -87,6 +87,7 @@
         <result property="cheat" column="cheat"/>
         <result property="examPass" column="exam_pass"/>
         <result property="examCheat" column="exam_cheat"/>
+        <result property="keyValue" column="key_value"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.grade.vo.ClassPeriodVo" id="ClassPeriodVo">
@@ -268,7 +269,8 @@
         ups.`status` =1 and ups.period_status = 1 and up.goods_id=#{goodsId} and up.user_id = #{userId} and up.type = 2) as exam_pass,
         (SELECT
         COUNT(up.id) FROM user_period up LEFT JOIN user_period_status ups on up.id = ups.period_id where ups.`status`
-        =0 and ups.period_status = 1 and up.goods_id=#{goodsId} and up.user_id = #{userId} and up.type = 2) as exam_cheat
+        =0 and ups.period_status = 1 and up.goods_id=#{goodsId} and up.user_id = #{userId} and up.type = 2) as exam_cheat,
+        (SELECT * FROM user_profile up where up.goods_id = #{goods_id and up.user_id =#{userId} and up.current_status = 1 and up.type =1}) as key_value
         FROM
         class_grade_user cgu
         LEFT JOIN class_grade cg ON cgu.grade_id = cg.grade_id