diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/vo/XskhAssessmentApprovalVo.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/vo/XskhAssessmentApprovalVo.java index 6d837e3b..1e2f4f53 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/vo/XskhAssessmentApprovalVo.java +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/vo/XskhAssessmentApprovalVo.java @@ -59,6 +59,20 @@ public class XskhAssessmentApprovalVo implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date endTime; + /** + * 数据统计开始时间 + */ + @ExcelProperty(value = "数据统计开始时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date dataStartTime; + + /** + * 数据统计结束时间 + */ + @ExcelProperty(value = "数据统计结束时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date dataEndTime; + /** * 学生ID */ @@ -218,4 +232,4 @@ public class XskhAssessmentApprovalVo implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; -} \ No newline at end of file +} diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/resources/mapper/xskh/XskhAssessmentApprovalMapper.xml b/backend/ruoyi-modules/ruoyi-xskh/src/main/resources/mapper/xskh/XskhAssessmentApprovalMapper.xml index 85a541fc..87783c2b 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/resources/mapper/xskh/XskhAssessmentApprovalMapper.xml +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/resources/mapper/xskh/XskhAssessmentApprovalMapper.xml @@ -38,6 +38,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -66,10 +68,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT + SELECT a.id, a.schedule_id, s.schedule_name, + s.start_time, + s.end_time, + s.data_start_time, + s.data_end_time, a.student_id, a.student_no, a.student_name, @@ -104,10 +110,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN sys_user u ON a.teacher_approval_by = u.user_id WHERE a.deleted = 0 AND a.class_id IN ( - SELECT id - FROM xg_class_msg - WHERE class_teacher_id = #{teacherId} - AND deleted = 0 + SELECT id + FROM xg_class_msg + WHERE class_teacher_id = #{teacherId} + AND deleted = 0 AND class_status = '1' ) @@ -128,12 +134,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT + SELECT a.id, a.schedule_id, s.schedule_name, s.start_time, s.end_time, + s.data_start_time, + s.data_end_time, a.student_id, a.student_no, a.student_name, @@ -172,4 +180,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND a.tenant_id = '000000' - \ No newline at end of file + diff --git a/web/src/api/xskh/assessmentApproval/types.ts b/web/src/api/xskh/assessmentApproval/types.ts index 67bea5b8..0fc21cfc 100644 --- a/web/src/api/xskh/assessmentApproval/types.ts +++ b/web/src/api/xskh/assessmentApproval/types.ts @@ -142,6 +142,10 @@ export interface XskhAssessmentApprovalForm extends BaseEntity { startTime?: string; /** 结束时间 */ endTime?: string; + /** 数据统计开始时间 */ + dataStartTime?: string; + /** 数据统计结束时间 */ + dataEndTime?: string; /** 自评得分 */ selfScore?: number; /** 班主任评分 */ @@ -408,4 +412,4 @@ export interface AssessmentScheduleOption { status: string; /** 状态名称 */ statusName: string; -} \ No newline at end of file +} diff --git a/web/src/views/xskh/assessmentApplication/AssessmentApplicationForm.vue b/web/src/views/xskh/assessmentApplication/AssessmentApplicationForm.vue index d8c6f087..4e0d7ab7 100644 --- a/web/src/views/xskh/assessmentApplication/AssessmentApplicationForm.vue +++ b/web/src/views/xskh/assessmentApplication/AssessmentApplicationForm.vue @@ -374,6 +374,8 @@ :indicator-name="currentIndicatorData.indicatorName" :student-id="form.studentId" :schedule-id="form.scheduleId" + :start-time="form.startTime" + :end-time="form.endTime" :data-start-time="form.dataStartTime" :data-end-time="form.dataEndTime" /> @@ -1076,6 +1078,9 @@ const openDialog = async (id?: string | number, title?: string, schedule?: Asses if (schedule) { form.value.dataStartTime = schedule.dataStartTime; form.value.dataEndTime = schedule.dataEndTime; + form.value.startTime = schedule.startTime; + form.value.endTime = schedule.endTime; + form.value.scheduleName = schedule.scheduleName; console.log('重新设置时间字段 - dataStartTime:', form.value.dataStartTime); console.log('重新设置时间字段 - dataEndTime:', form.value.dataEndTime); } @@ -1143,6 +1148,9 @@ const openDialog = async (id?: string | number, title?: string, schedule?: Asses form.value.dataEndTime = schedule.dataEndTime; console.log('重新设置时间字段 - dataStartTime:', form.value.dataStartTime); console.log('重新设置时间字段 - dataEndTime:', form.value.dataEndTime); + form.value.startTime = schedule.startTime; + form.value.endTime = schedule.endTime; + form.value.scheduleName = schedule.scheduleName; } // 确保自评得分列表正确回显 @@ -1438,7 +1446,9 @@ const handleViewIndicatorData = (row: XskhAssessmentSelfScoreForm) => { indicatorId: currentIndicatorData.indicatorId, indicatorName: currentIndicatorData.indicatorName, dataStartTime: form.value.dataStartTime, - dataEndTime: form.value.dataEndTime + dataEndTime: form.value.dataEndTime, + startTime: form.value.startTime, + endTime: form.value.endTime }); indicatorDataDialogRef.value?.openDialog(); }); diff --git a/web/src/views/xskh/assessmentApproval/AssessmentApprovalForm.vue b/web/src/views/xskh/assessmentApproval/AssessmentApprovalForm.vue index e25beb2d..427102ab 100644 --- a/web/src/views/xskh/assessmentApproval/AssessmentApprovalForm.vue +++ b/web/src/views/xskh/assessmentApproval/AssessmentApprovalForm.vue @@ -1,352 +1,382 @@ - - - - - - - - - 基础信息 - - - - - - {{ form.scheduleName || '暂无' }} - - - - - {{ form.studentNo || '暂无' }} - - - - - {{ form.studentName || '暂无' }} - - - - - {{ form.collegeName || '暂无' }} - - - - - {{ form.majorName || '暂无' }} - - - - - {{ form.className || '暂无' }} - - - - - {{ form.startTime || '暂无' }} - - - - - {{ form.endTime || '暂无' }} - + + + + + + + + + + 基础信息 + + + + + + {{ form.scheduleName || '暂无' }} + + + + + {{ form.studentNo || '暂无' }} + + + + + {{ form.studentName || '暂无' }} + + + + + {{ form.collegeName || '暂无' }} + + + + + {{ form.majorName || '暂无' }} + + + + + {{ form.className || '暂无' }} + + + + + {{ form.startTime || '暂无' }} + + + + + {{ form.endTime || '暂无' }} + + + + + + + + + + + + + 指标模块 + + + + + + + {{ scope.row.indicatorName }} + + + + + + + + + + + {{ scope.row.selfScore || '0' }} + + + + + + + {{ scope.row.selfRemark || '暂无备注' }} + + + + + + + {{ scope.row.teacherScore || '0' }} + + + + + + + + {{ scope.row.teacherRemark || '暂无备注' }} + + + + + + - - - - - - - - - 指标模块 - - - - - - - - - - - {{ scope.row.selfScore || '0' }} - - - - - - - {{ scope.row.selfRemark || '暂无备注' }} - - - - - - - {{ scope.row.teacherScore || '0' }} - - - - - - - - {{ scope.row.teacherRemark || '暂无备注' }} - - - - - - - - + + + + + 附加分模块 + + + + + + + 附加分项目 {{ index + 1 }} + + + + + + {{ item.bonusName || '暂无' }} + + + + + {{ item.bonusScore || '0' }} + + + + + {{ item.bonusContent || '暂无内容' }} + + + + + + + + 支持图片、视频、PDF、Word文档等格式,单个文件大小不超过10MB,最多上传15个文件。 + - - - - - 附加分模块 - - - - - - - 附加分项目 {{ index + 1 }} - - - - - - {{ item.bonusName || '暂无' }} - - - - - {{ item.bonusScore || '0' }} - - - - - {{ item.bonusContent || '暂无内容' }} - - - - - - - - 支持图片、视频、PDF、Word文档等格式,单个文件大小不超过10MB,最多上传15个文件。 - - - - - - 将文件拖到此处,或点击上传 - - - - - - - - - - - {{ getFileExt(file.name) }} - - - - - 上传中... - - - - - - {{ getShortFileName(file.name) }} - - - - - - - - - - - - - + + + + 将文件拖到此处,或点击上传 - - - - - - - - - - {{ getBonusStatusText(item.status) }} - - - - - - - - - - - - - {{ item.approvalScore || '0' }} - - - - - - - - {{ item.approvalRemark || '暂无备注' }} - - - - - - - - - - - - - 得分统计 + + + + + + + + + {{ getFileExt(file.name) }} + + + + + 上传中... + + + + + + {{ getShortFileName(file.name) }} + + + + + + + + + + + + + + + + + + + + + + + + {{ getBonusStatusText(item.status) }} + + + + + + + + + + + + + {{ item.approvalScore || '0' }} + + + + + + + + {{ item.approvalRemark || '暂无备注' }} + + + + + + - - - - - - {{ form.selfScore || '0' }} - - - - - - - {{ form.teacherScore || '0' }} - - - - - - - {{ form.totalScore || '0' }} - - - - - - - {{ getStatusText(form.status) }} - - - - - - - {{ form.selfRemark || '暂无备注' }} - - - - - - - {{ form.teacherApprovalRemark || '暂无备注' }} - - - - - - - - - - - - + + + + + + + +