Merge remote-tracking branch 'origin/master'

edu-user/edu-user-server/src/main/java/com/keao/edu/user/page/StudentExamResultQueryInfo.java

@@ -24,6 +24,9 @@ public class StudentExamResultQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "专业编号")
     private Integer subjectId;
 
+    @ApiModelProperty(value = "学员编号")
+    private Integer studentId;
+
     @ApiModelProperty(value = "级别")
     private Integer level;
 
@@ -48,6 +51,14 @@ public class StudentExamResultQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "考级项目状态")
     private Integer resultConfirm;
 
+    public Integer getStudentId() {
+        return studentId;
+    }
+
+    public void setStudentId(Integer studentId) {
+        this.studentId = studentId;
+    }
+
     public Integer getOrganId() {
         return organId;
     }

edu-user/edu-user-server/src/main/resources/config/mybatis/StudentExamResultMapper.xml

@@ -135,6 +135,9 @@
 			<if test="studentName!=null and studentName!=''">
 				AND su.real_name_ LIKE CONCAT(#{studentName}, '%')
 			</if>
+			<if test="studentId != null">
+				AND su.id_ = #{studentId}
+			</if>
 			<if test="examName!=null and examName!=''">
 				AND eb.name_ LIKE CONCAT(#{examName}, '%')
 			</if>