From 92da1828596feb91bc7db02cb91f7f538b23e486 Mon Sep 17 00:00:00 2001
From: 15976874561 <2553956742@qq.com>
Date: Tue, 14 Oct 2025 11:38:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BE=85=E5=AF=BC=E5=91=98=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=8F=AD=E7=BA=A7=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/srs/comprehensive/domain/Vo/CphSearch.java  | 3 ++-
 .../main/resources/mapper/comprehensive/SrsStudentMapper.xml  | 4 ++--
 .../main/resources/mapper/comprehensive/SrsZxjApplyMapper.xml | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/Vo/CphSearch.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/Vo/CphSearch.java
index 01e32df..fc8b841 100644
--- a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/Vo/CphSearch.java
+++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/Vo/CphSearch.java
@@ -36,13 +36,14 @@ public class CphSearch {
     private  String typeName;
     /* 助学金审核记录操作人*/
     private String operator;
-    
+
     public String step;
 
     public String sfzhm;
 
     public String xm;
     public String xh;
+    private String bj;
     /** 贫困生认定意见*/
     public String yj;
     public String classCode;
diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsStudentMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsStudentMapper.xml
index 60aaa7f..7a58159 100644
--- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsStudentMapper.xml
+++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsStudentMapper.xml
@@ -729,7 +729,7 @@
                      total_count,
                      male_count,
                      female_count
-              from (select left (AES_DECRYPT(UNHEX(id_card), 'zhxg'), 4) as id_card, count (1) as total_count, sum (case when gender='男' then 1 else 0 end) as male_count, sum (case when gender='女' then 1 else 0 end) as female_count
+              from (select left (AES_DECRYPT(UNHEX(id_card), 'zhxg'), 4) as id_card, count(1) as total_count, sum(case when gender='男' then 1 else 0 end) as male_count, sum(case when gender='女' then 1 else 0 end) as female_count
                     from srs_student d left join srs_class e
                     on d.class_id=e.class_id
                         left join srs_grade f on f.grade_id=e.grade_id
@@ -781,7 +781,7 @@
                      total_count,
                      male_count,
                      female_count
-              from (select left (AES_DECRYPT(UNHEX(id_card), 'zhxg'), 4) as id_card, count (1) as total_count, sum (case when gender='男' then 1 else 0 end) as male_count, sum (case when gender='女' then 1 else 0 end) as female_count
+              from (select left (AES_DECRYPT(UNHEX(id_card), 'zhxg'), 4) as id_card, count(1) as total_count, sum(case when gender='男' then 1 else 0 end) as male_count, sum(case when gender='女' then 1 else 0 end) as female_count
                     from srs_student d left join srs_class e
                     on d.class_id=e.class_id
                         left join srs_grade f on f.grade_id=e.grade_id
diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjApplyMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjApplyMapper.xml
index 3cb4ae2..d9cb126 100644
--- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjApplyMapper.xml
+++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjApplyMapper.xml
@@ -204,6 +204,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stuNo != null "> and a.xh = #{stuNo}</if>
             <if test="xm != null "> and a.xm like concat('%',#{xm},'%')</if>
             <if test="xh != null "> and a.xh like concat('%',#{xh},'%')</if>
+            <if test="classId != null "> and c.class_id = #{classId}</if>
         </where>
         order by a.id asc
     </select>