From 827275ba3abe7449cc8a47dea356dd6e11ccbdfd Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Mon, 24 Oct 2022 23:50:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E8=AF=BE=E6=B7=BB=E5=8A=A0=E5=AD=A6?=
 =?UTF-8?q?=E7=94=9F=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7=E5=92=8C=E5=A7=93=E5=90=8D=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ibeetl/jlw/web/query/StudentQuery.java  | 12 ++++++++++++
 web/src/main/resources/sql/jlw/student.md            |  3 +++
 .../com/ibeetl/jlw/web/StudentControllerTest.java    |  5 ++++-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/StudentQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/StudentQuery.java
index e3cfb51d..1040e026 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/query/StudentQuery.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/query/StudentQuery.java
@@ -40,6 +40,10 @@ public class StudentQuery extends PageParam {
     private String studentWeixinInfo;
 
     private String studentStatuses;
+    
+    // 学生编号或者姓名
+
+    private String studentSnOrName;
 
     private String classIds;
 
@@ -180,6 +184,14 @@ public class StudentQuery extends PageParam {
         this.universitySystemId = universitySystemId;
     }
 
+    public String getStudentSnOrName() {
+        return studentSnOrName;
+    }
+
+    public void setStudentSnOrName(String studentSnOrName) {
+        this.studentSnOrName = studentSnOrName;
+    }
+
     public static class StudentTemp{ //临时学生类
 
         private Long studentsId;
diff --git a/web/src/main/resources/sql/jlw/student.md b/web/src/main/resources/sql/jlw/student.md
index da8bed0a..775a90b1 100644
--- a/web/src/main/resources/sql/jlw/student.md
+++ b/web/src/main/resources/sql/jlw/student.md
@@ -216,6 +216,9 @@ queryByConditionQuery
   @if(!isEmpty(userId)){
   and t.user_id =#userId#
   @}
+  @if(!isEmpty(studentSnOrName)){
+  and (t.student_sn like #'%'+studentSnOrName+'%'# or t.student_name like #'%'+studentSnOrName+'%'#)
+  @}
   @if(!isEmpty(orderByRand)){
   ORDER BY RAND()
   @}
diff --git a/web/src/test/java/com/ibeetl/jlw/web/StudentControllerTest.java b/web/src/test/java/com/ibeetl/jlw/web/StudentControllerTest.java
index 4abb8cb1..f40bf463 100644
--- a/web/src/test/java/com/ibeetl/jlw/web/StudentControllerTest.java
+++ b/web/src/test/java/com/ibeetl/jlw/web/StudentControllerTest.java
@@ -31,7 +31,10 @@ class StudentControllerTest extends BaseTest {
         //构造请求参数
         RequestBuilder rb = MockMvcRequestBuilders.post(API + "/getPageList.do")
                 .contentType(MediaType.APPLICATION_FORM_URLENCODED_VALUE)
-                .param("universitySystemId", "1569331621092564992");
+                .param("universitySystemId", "1569331621092564992")
+//                .param("studentSnOrName", "1_002")
+                .param("studentSnOrName", "张云")
+                ;
 
         //发送请求，验证返回结果
         String result = mvc.perform(rb)