From 12407cb28a7362df94e2797727aca0882f3f9e6b Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Mon, 9 Mar 2026 17:53:41 +0800
Subject: [PATCH] =?UTF-8?q?feat(study):=20=E6=B7=BB=E5=8A=A0=E5=AD=A6?=
 =?UTF-8?q?=E7=94=9F=E7=BB=9F=E8=AE=A1=E6=9F=A5=E8=AF=A2=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E5=B9=B4=E4=BB=BD=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zcloud/edu/dto/study/StudentCountQry.java     | 2 ++
 .../src/main/resources/mapper/study/StudentMapper.xml      | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/web-client/src/main/java/com/zcloud/edu/dto/study/StudentCountQry.java b/web-client/src/main/java/com/zcloud/edu/dto/study/StudentCountQry.java
index 2c4a1a8..4f7d290 100644
--- a/web-client/src/main/java/com/zcloud/edu/dto/study/StudentCountQry.java
+++ b/web-client/src/main/java/com/zcloud/edu/dto/study/StudentCountQry.java
@@ -33,5 +33,7 @@ public class StudentCountQry {
     private List<Long> corpinfoIds;
     private List<String> phones;
 
+    private String year;
+
 }
 
diff --git a/web-infrastructure/src/main/resources/mapper/study/StudentMapper.xml b/web-infrastructure/src/main/resources/mapper/study/StudentMapper.xml
index 27e9afa..ddc9a53 100644
--- a/web-infrastructure/src/main/resources/mapper/study/StudentMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/study/StudentMapper.xml
@@ -132,6 +132,9 @@
         from
             user u
             left join training_user tu on tu.phone = u.username
+            left join student s  on s.phone=u.username
+            left join student_exam_record ser on ser.student_id = s.student_id
+            left join class c on ser.class_id = c.class_id
         where u.delete_enum = 'FALSE'
             AND u.employment_flag = '1'
             and tu.start_time &lt;= now()
@@ -142,6 +145,10 @@
                     #{corpinfoId}
                 </foreach>
             </if>
+            <if test="params.year != null and params.year != ''">
+                AND (DATE_FORMAT(c.start_time, '%Y') =  #{params.studentId}
+                OR DATE_FORMAT(c.start_time, '%Y') = #{params.studentId})
+            </if>
             GROUP BY u.corpinfo_id
     </select>