diff --git a/backend/roomroot-admin/src/main/java/com/roomroot/web/controller/jwgl/StudentRecordsController.java b/backend/roomroot-admin/src/main/java/com/roomroot/web/controller/jwgl/StudentRecordsController.java index a9e49a4d..2c10b600 100644 --- a/backend/roomroot-admin/src/main/java/com/roomroot/web/controller/jwgl/StudentRecordsController.java +++ b/backend/roomroot-admin/src/main/java/com/roomroot/web/controller/jwgl/StudentRecordsController.java @@ -520,9 +520,10 @@ public class StudentRecordsController { @RequestParam(required = false) String kcbh, @RequestParam(required = false) String xydbh, @RequestParam(required = false) String xh, + @RequestParam(required = false) String xybh, @RequestParam(required = false) Integer nd) { return Result.success(studentRecordsService.pageCourseGrades( - new PageQuery(pageNum, pageSize), kcbh, xydbh, xh, nd)); + new PageQuery(pageNum, pageSize), kcbh, xydbh, xh, xybh, nd)); } /** diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/StudentRecordsService.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/StudentRecordsService.java index 0c146daa..025129d2 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/StudentRecordsService.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/StudentRecordsService.java @@ -56,8 +56,8 @@ public interface StudentRecordsService { // ========== 学员课程成绩查询 ========== - /** 分页查询学员的课程成绩列表（按课程编号、学员队编号、学号、年度筛选） */ - PageResult pageCourseGrades(PageQuery query, String kcbh, String xydbh, String xh, Integer nd); + /** 分页查询学员的课程成绩列表（按课程编号、学员队编号、学号、学员编号、年度筛选） */ + PageResult pageCourseGrades(PageQuery query, String kcbh, String xydbh, String xh, String xybh, Integer nd); /** 分页查询学员的课程过程成绩列表（按学员编号、年度筛选，年度为空默认最新年度） */ PageResult pageCourseProcessGrades(PageQuery query, String xybh, Integer nd); diff --git a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/StudentRecordsServiceImpl.java b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/StudentRecordsServiceImpl.java index d29c1fea..62a7b171 100644 --- a/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/StudentRecordsServiceImpl.java +++ b/backend/roomroot-jwgl/src/main/java/com/roomroot/jwgl/service/impl/StudentRecordsServiceImpl.java @@ -379,8 +379,8 @@ public class StudentRecordsServiceImpl implements StudentRecordsService { // ========== 学员课程成绩查询 ========== @Override - public PageResult pageCourseGrades(PageQuery query, String kcbh, String xydbh, String xh, Integer nd) { - String selfStudentId = null; + public PageResult pageCourseGrades(PageQuery query, String kcbh, String xydbh, String xh, String xybh, Integer nd) { + String selfStudentId = trimToNull(xybh); if (jwglRoleHelper.isStudent()) { selfStudentId = jwglRoleHelper.requireStudentId(); } diff --git a/frontend/src/views/student/studentInfo/index.vue b/frontend/src/views/student/studentInfo/index.vue index 0a8f0d71..db112e01 100644 --- a/frontend/src/views/student/studentInfo/index.vue +++ b/frontend/src/views/student/studentInfo/index.vue @@ -284,7 +284,9 @@ - + + + @@ -302,7 +304,9 @@ - + + + @@ -327,6 +331,7 @@ import { listStudentRecord, listPeriodOptions, + listKbOptions, getStudentRecord, addStudentRecord, updateStudentRecord, @@ -427,6 +432,8 @@ export default { submitting: false, periodOptions: [], periodOptionsLoaded: false, + kbOptions: [], + kbOptionsLoaded: false, teamOptions: [], teamOptionsLoaded: false, formData: this.createEmptyForm(), @@ -575,7 +582,7 @@ export default { createEmptyForm() { return { bh: '', xh: '', xm: '', xydqbh: '', zjhm: '', zzmm: '', xb: '', csrq: '', mz: '', jg: '', - whcd: '', xylb: '', ssjq: '', gfs: '', txzt: '', ljzt: '', fbzt: '', yxckcj: '', dqbzbh: '', yzc: '', + whcd: '', xylb: '', ssjq: '', gfs: '', txzt: '', ljzt: '', fbzt: '', yxckcj: '1', dqbzbh: '', yzc: '', jrzjlx: '', sfzh: '', lxdh: '', txdz: '', bz: '', dtsj: '' } }, @@ -646,6 +653,20 @@ export default { }).catch(() => {}) }, + loadKbOptions() { + if (this.kbOptionsLoaded) return + listKbOptions().then(res => { + this.kbOptions = (res && res.data) || [] + this.kbOptionsLoaded = true + }).catch(() => {}) + }, + + /** 科目列：显示「名称（编号）」，查不到名称时只显示编号 */ + subjectLabel(kmbh) { + const hit = this.kbOptions.find(item => String(item.kbh) === String(kmbh)) + return hit ? `${hit.kmc}（${kmbh}）` : (kmbh || '') + }, + loadTeamOptions() { if (this.teamOptionsLoaded) return listTeam({ pageNum: 1, pageSize: 1000 }).then(res => { @@ -739,6 +760,7 @@ export default { this.gradesTab = 'grades' this.gradesVisible = true this.gradesLoading = true + this.loadKbOptions() const emptyResponse = { data: { records: [] } } const query = { pageNum: 1, pageSize: 1000, xybh: this.currentBh } diff --git a/frontend/src/views/teachingLog/organLog/components/auditedView.vue b/frontend/src/views/teachingLog/organLog/components/auditedView.vue index 4fdec90a..bcc28a86 100644 --- a/frontend/src/views/teachingLog/organLog/components/auditedView.vue +++ b/frontend/src/views/teachingLog/organLog/components/auditedView.vue @@ -222,7 +222,7 @@ export default { /** 组件方法：包一层全局 formatDate，供模板调用 */ formatDate(val) { - return formatDate(val) + return (formatDate(val) || '').split(' ')[0] }, /** 根据已填写的查询值构建实际查询参数 */ diff --git a/frontend/src/views/teachingLog/organLog/components/logView.vue b/frontend/src/views/teachingLog/organLog/components/logView.vue index a8d90f16..fe93fa8a 100644 --- a/frontend/src/views/teachingLog/organLog/components/logView.vue +++ b/frontend/src/views/teachingLog/organLog/components/logView.vue @@ -259,7 +259,7 @@ export default { }, methods: { formatDate(val) { - return formatDate(val) + return (formatDate(val) || '').split(' ')[0] }, handleSelectionChange(rows) { diff --git a/frontend/src/views/teachingLog/organLog/components/reportedView.vue b/frontend/src/views/teachingLog/organLog/components/reportedView.vue index b5614fdb..bb108af3 100644 --- a/frontend/src/views/teachingLog/organLog/components/reportedView.vue +++ b/frontend/src/views/teachingLog/organLog/components/reportedView.vue @@ -247,7 +247,7 @@ export default { /** 组件方法：包一层全局 formatDate，供模板调用 */ formatDate(val) { - return formatDate(val) + return (formatDate(val) || '').split(' ')[0] }, /** 根据已填写的查询值构建实际查询参数 */