feat(exam): 添加按班级、年级、学生姓名筛选考试结果功能

- 在ExamWordsResultReqVO中新增classId、gradeId、studentName字段
- 修改ExamWordsJudgeService接口及实现，支持按筛选条件获取考试结果
- 在ExamWordsJudgeResultDOMapper中添加按学生ID列表分页查询方法
- 扩展StudentDOMapper，新增按班级、年级和姓名查询学生列表方法
- 修改ExamWordsController，支持从请求体接收筛选参数
- 修改前端exam.js，调用接口时传递筛选参数
- 在uploadpng.vue页面新增筛选表单，支持班级、年级、学生姓名输入
- 增加班级和年级选项数据的获取
- 实现筛选查询、重置功能及班级切换自动同步年级
- 在App.vue中配置Element Plus中文语言环境
- 调整配置文件，更新学习计划模板路径
- 修改接口权限配置，关闭plan/word/voice路径的鉴权

enlish-service/src/main/java/com/yinlihupo/enlish/service/config/SaTokenConfigure.java

@@ -25,9 +25,11 @@ public class SaTokenConfigure implements WebMvcConfigurer {
 
             SaRouter.match("/**")
                     .notMatch("/login/**")
+                    .notMatch("plan/word/voice")
                     .check(r -> StpUtil.checkLogin());
 
             SaRouter.match("/admin/**")
+                    .notMatch("plan/word/voice")
                     .check(r -> StpUtil.checkRole("root"));
 
         }))

enlish-service/src/main/java/com/yinlihupo/enlish/service/controller/ExamWordsController.java

@@ -107,8 +107,11 @@ public class ExamWordsController {
     PageResponse<ExamWordsResultRspVO> getExamWordsResult(@RequestBody ExamWordsResultReqVO examWordsResultReqVO) {
         Integer page = examWordsResultReqVO.getPage();
         Integer size = examWordsResultReqVO.getSize();
+        Integer classId = examWordsResultReqVO.getClassId();
+        Integer gradeId = examWordsResultReqVO.getGradeId();
+        String studentName = examWordsResultReqVO.getStudentName();
         Integer total = examWordsJudgeService.getExamWordsJudgeResultCount();
-        List<ExamWordsJudgeResultDO> examWordsJudgeResult = examWordsJudgeService.getExamWordsJudgeResult(page, size);
+        List<ExamWordsJudgeResultDO> examWordsJudgeResult = examWordsJudgeService.getExamWordsJudgeResult(page, size, classId, gradeId, studentName);
         List<ExamWordsResultRspVO> list = examWordsJudgeResult.stream().map(examWordsJudgeResultDO -> ExamWordsResultRspVO
                 .builder()
                 .id(examWordsJudgeResultDO.getId())

enlish-service/src/main/java/com/yinlihupo/enlish/service/domain/mapper/ExamWordsJudgeResultDOMapper.java

@@ -24,4 +24,6 @@ public interface ExamWordsJudgeResultDOMapper {
     List<ExamWordsJudgeResultDO> selectByStudentId(@Param("studentId") Integer studentId);
 
     List<ExamWordsJudgeResultDO> selectByStudentIdAndLimitTime(@Param("studentId") Integer studentId);
+
+    List<ExamWordsJudgeResultDO> selectByPageAndStudentIds(@Param("startIndex") Integer startIndex, @Param("pageSize") Integer pageSize, @Param("studentIds") List<Integer> studentIds);
 }

enlish-service/src/main/java/com/yinlihupo/enlish/service/domain/mapper/StudentDOMapper.java

@@ -23,4 +23,10 @@ public interface StudentDOMapper {
     int selectStudentCountByClassId(@Param("classId") Integer classId);
 
     int updateStudentActualGradeId(@Param("studentId") Integer studentId, @Param("gradeId") Integer gradeId);
+
+    List<StudentDO> selectStudentDOListByClassId(@Param("classId") Integer classId);
+
+    List<StudentDO> selectStudentDOListByGradeId(@Param("gradeId") Integer gradeId);
+
+    List<StudentDO> selectStudentDOListByName(@Param("name") String name);
 }

enlish-service/src/main/java/com/yinlihupo/enlish/service/model/vo/exam/ExamWordsResultReqVO.java

@@ -13,4 +13,8 @@ public class ExamWordsResultReqVO {
 
     private Integer page;
     private Integer size;
+
+    private Integer classId;
+    private Integer gradeId;
+    private String studentName;
 }

enlish-service/src/main/java/com/yinlihupo/enlish/service/model/vo/student/AddStudentReqVO.java

@@ -1,5 +1,6 @@
 package com.yinlihupo.enlish.service.model.vo.student;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -16,5 +17,6 @@ public class AddStudentReqVO {
     private String name;
     private Integer classId;
     private Integer gradeId;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
 }

enlish-service/src/main/java/com/yinlihupo/enlish/service/service/ExamWordsJudgeService.java

@@ -9,7 +9,7 @@ public interface ExamWordsJudgeService {
 
     void judgeExamWords(int count);
 
-    List<ExamWordsJudgeResultDO> getExamWordsJudgeResult(Integer page, Integer pageSize);
+    List<ExamWordsJudgeResultDO> getExamWordsJudgeResult(Integer page, Integer pageSize, Integer classId, Integer gradeId, String studentName);
 
     Integer getExamWordsJudgeResultCount();
 

enlish-service/src/main/java/com/yinlihupo/enlish/service/service/judge/ExamWordsJudgeServiceImpl.java

@@ -326,8 +326,24 @@ public class ExamWordsJudgeServiceImpl implements ExamWordsJudgeService {
     }
 
     @Override
-    public List<ExamWordsJudgeResultDO> getExamWordsJudgeResult(Integer page, Integer pageSize) {
+    public List<ExamWordsJudgeResultDO> getExamWordsJudgeResult(Integer page, Integer pageSize, Integer classId, Integer gradeId, String studentName) {
-        return examWordsJudgeResultDOMapper.selectByPage((page - 1) * pageSize, pageSize);
+
+        List<Integer> studentIds = new ArrayList<>();
+        if (classId != null) {
+            studentIds.addAll(studentDOMapper.selectStudentDOListByClassId(classId).stream().map(StudentDO::getId).toList());
+        }
+        if (gradeId != null) {
+            studentIds.addAll(studentDOMapper.selectStudentDOListByGradeId(gradeId).stream().map(StudentDO::getId).toList());
+        }
+        if (!studentName.isEmpty()) {
+            studentIds.addAll(studentDOMapper.selectStudentDOListByName(studentName).stream().map(StudentDO::getId).toList());
+        }
+
+        if (studentIds.isEmpty()) {
+            return examWordsJudgeResultDOMapper.selectByPage((page - 1) * pageSize, pageSize);
+        } else {
+            return examWordsJudgeResultDOMapper.selectByPageAndStudentIds((page - 1) * pageSize, page * pageSize, studentIds);
+        }
     }
 
     @Override

enlish-service/src/main/resources/config/application-dev.yml

@@ -35,7 +35,7 @@ templates:
     count: 100
     data: C:\project\tess
     plan:
-        weekday: C:\project\java\enlish_edu\enlish\enlish-service\src\main\resources\templates\tem_study_plan_v5.docx
+        weekday: C:\project\java\enlish_edu\enlish\enlish-service\src\main\resources\templates\tem_study_plan_v6.docx
         weekend: C:\project\java\enlish_edu\enlish\enlish-service\src\main\resources\templates\study_plan_review_v2.docx
     plan_day: 7
 tmp:

enlish-service/src/main/resources/mapper/ExamWordsJudgeResultDOMapper.xml

@@ -83,4 +83,16 @@
         and start_date between date_sub(now(), interval 7 day) and now()
     </select>
 
+    <select id="selectByPageAndStudentIds" resultMap="BaseResultMap">
+        select *
+        from exam_words_judge_result
+        where student_id in
+        <foreach item="item" index="index" collection="studentIds"
+                 open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        order by start_date
+        limit #{startIndex}, #{pageSize}
+    </select>
+
 </mapper>

enlish-service/src/main/resources/mapper/StudentDOMapper.xml

@@ -75,4 +75,24 @@
         where class_id = #{classId}
             and is_deleted = 0
     </select>
+
+    <select id="selectStudentDOListByClassId" resultMap="BaseResultMap">
+        select *
+        from student
+        where class_id = #{classId}
+            and is_deleted = 0
+    </select>
+
+    <select id="selectStudentDOListByGradeId" resultMap="BaseResultMap">
+        select *
+        from student
+        where grade_id = #{gradeId}
+            and is_deleted = 0
+    </select>
+    <select id="selectStudentDOListByName" resultMap="BaseResultMap">
+        select *
+        from student
+        where name like concat('%', #{name}, '%')
+            and is_deleted = 0
+    </select>
 </mapper>

enlish-service/src/test/java/com/yinlihupo/enlish/service/service/exam/ExamWordsJudgeServiceTest.java

@@ -56,8 +56,8 @@ public class ExamWordsJudgeServiceTest {
 
     @Test
     public void selectExamWordsJudgeResult() {
-        List<ExamWordsJudgeResultDO> examWordsJudgeResult = examWordsJudgeService.getExamWordsJudgeResult(1, 10);
+//        List<ExamWordsJudgeResultDO> examWordsJudgeResult = examWordsJudgeService.getExamWordsJudgeResult(1, 10);
-        log.info("examWordsJudgeResult:{}", examWordsJudgeResult);
+//        log.info("examWordsJudgeResult:{}", examWordsJudgeResult);
     }
 
 //    @Test

enlish-vue/src/App.vue

@@ -1,11 +1,14 @@
 
 
 <template>
-	<router-view></router-view>
+	<el-config-provider :locale="locale">
+		<router-view />
+	</el-config-provider>
 </template>
 
 <script setup>
-
+import zhCn from 'element-plus/es/locale/lang/zh-cn'
+const locale = zhCn
 </script>
 
 <style>

enlish-vue/src/api/exam.js

@@ -5,10 +5,13 @@ export function uploadExamWordsPng(data) {
     return axios.post('/exam/words/submit', data)
 }
 
-export function getExamWordsResult(page, size) {
+export function getExamWordsResult(page, size, classId, gradeId, studentName) {
     return axios.post('/exam/words/get', {
         page: page,
-        size: size
+        size: size,
+        classId: classId,
+        gradeId: gradeId,
+        studentName: studentName
     })
 }
 

enlish-vue/src/pages/uploadpng.vue

@@ -19,6 +19,35 @@
                     </div>
                     <div class="bg-white dark:bg-gray-800 rounded-lg shadow p-6">
                         <div class="text-lg font-semibold mb-4">结果集</div>
+                        <el-form :inline="true" class="mb-4">
+                            <el-form-item label="班级">
+                                <el-select v-model="classId" placeholder="选择班级" clearable filterable @change="onClassChange" style="min-width: 220px">
+                                    <el-option
+                                        v-for="item in classOptions"
+                                        :key="item.id"
+                                        :label="`${item.title}${item.gradeName ? '（' + item.gradeName + '）' : ''}`"
+                                        :value="item.id"
+                                    />
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item label="年级">
+                                <el-select v-model="gradeId" placeholder="选择年级" clearable filterable style="min-width: 220px">
+                                    <el-option
+                                        v-for="g in gradeOptions"
+                                        :key="g.id"
+                                        :label="g.title"
+                                        :value="g.id"
+                                    />
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item label="学生姓名">
+                                <el-input v-model="studentName" placeholder="学生姓名" clearable />
+                            </el-form-item>
+                            <el-form-item>
+                                <el-button type="primary" @click="handleSearch">查询</el-button>
+                                <el-button @click="handleReset">重置</el-button>
+                            </el-form-item>
+                        </el-form>
                         <el-table
                             :data="list"
                             border
@@ -70,6 +99,8 @@ import Header from '@/layouts/components/Header.vue'
 import ExamWordsDetailCard from '@/layouts/components/ExamWordsDetailCard.vue'
 import { ref, onMounted } from 'vue'
 import { uploadExamWordsPng, getExamWordsResult } from '@/api/exam'
+import { getClassList } from '@/api/class'
+import { getGradeList } from '@/api/grade'
 
 const list = ref([])
 const pageNo = ref(1)
@@ -78,11 +109,22 @@ const totalCount = ref(0)
 const loading = ref(false)
 const showDetail = ref(false)
 const selectedId = ref(null)
+const classId = ref(null)
+const gradeId = ref(null)
+const studentName = ref('')
+const classOptions = ref([])
+const gradeOptions = ref([])
 
 async function fetchList() {
     loading.value = true
     try {
-        const res = await getExamWordsResult(pageNo.value, pageSize.value)
+        const res = await getExamWordsResult(
+            pageNo.value,
+            pageSize.value,
+            classId.value,
+            gradeId.value,
+            studentName.value
+        )
         const d = res.data
         list.value = Array.isArray(d.data) ? d.data : []
         totalCount.value = d.totalCount || 0
@@ -93,6 +135,18 @@ async function fetchList() {
     }
 }
 
+async function fetchClassOptions() {
+    const res = await getClassList(1, 200)
+    const d = res.data
+    classOptions.value = Array.isArray(d.data) ? d.data : []
+}
+
+async function fetchGradeOptions() {
+    const res = await getGradeList(1, 200)
+    const d = res.data
+    gradeOptions.value = Array.isArray(d.data) ? d.data : []
+}
+
 function handlePageChange(p) {
     pageNo.value = p
     fetchList()
@@ -117,8 +171,28 @@ function handleRowClick(row) {
     showDetail.value = true
 }
 
+function handleSearch() {
+    pageNo.value = 1
+    fetchList()
+}
+
+function handleReset() {
+    classId.value = null
+    gradeId.value = null
+    studentName.value = ''
+    pageNo.value = 1
+    fetchList()
+}
+
+function onClassChange(val) {
+    const item = classOptions.value.find(i => i.id === val)
+    gradeId.value = item ? item.gradeId : null
+}
+
 onMounted(() => {
     fetchList()
+    fetchClassOptions()
+    fetchGradeOptions()
 })
 </script>