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 corpinfoIds; private List 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 <= now() @@ -142,6 +145,10 @@ #{corpinfoId} + + AND (DATE_FORMAT(c.start_time, '%Y') = #{params.studentId} + OR DATE_FORMAT(c.start_time, '%Y') = #{params.studentId}) + GROUP BY u.corpinfo_id