From db3d6c786e25bb1af0e10b6243990e121309f28d Mon Sep 17 00:00:00 2001 From: zlwu <704541015@qq.com> Date: Tue, 19 Aug 2025 08:10:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xskh/domain/XskhDisciplineRecord.java | 6 + .../学生考核管理/学生考核管理数据库模型.sql | 2 +- .../xsDisciplineRecord/disciplineRecord.ts | 75 ++ .../xsDisciplineRecord/types.ts | 403 +++++++ .../DisciplineRecordForm.vue | 1006 +++++++++++++++++ .../views/xskh/xsDisciplineRecord/index.vue | 321 ++++++ 6 files changed, 1812 insertions(+), 1 deletion(-) create mode 100644 web/src/api/xskh/xsDisciplineRecord/disciplineRecord.ts create mode 100644 web/src/api/xskh/xsDisciplineRecord/xsDisciplineRecord/types.ts create mode 100644 web/src/views/xskh/xsDisciplineRecord/DisciplineRecordForm.vue create mode 100644 web/src/views/xskh/xsDisciplineRecord/index.vue diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/XskhDisciplineRecord.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/XskhDisciplineRecord.java index d2dc4f91..83ccbd65 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/XskhDisciplineRecord.java +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/XskhDisciplineRecord.java @@ -115,4 +115,10 @@ public class XskhDisciplineRecord extends TenantEntity { */ private String attachmentOssIds; + /** + * 删除标志(0-未删除 1-已删除) + */ + @TableLogic(value = "0", delval = "1") + private Long deleted; + } diff --git a/docs/设计文档/database/学生考核管理/学生考核管理数据库模型.sql b/docs/设计文档/database/学生考核管理/学生考核管理数据库模型.sql index f648e8ec..fc991671 100644 --- a/docs/设计文档/database/学生考核管理/学生考核管理数据库模型.sql +++ b/docs/设计文档/database/学生考核管理/学生考核管理数据库模型.sql @@ -71,7 +71,7 @@ CREATE TABLE `xskh_discipline_revoke` ( `student_id` bigint(20) NOT NULL COMMENT '学生ID', `student_name` varchar(50) NOT NULL COMMENT '学生姓名', `revoke_reason` varchar(500) NOT NULL COMMENT '撤销申请原因', - `revoke_evidence` varchar(500) DEFAULT NULL COMMENT '撤销证明材料', + `revoke_evidence` varchar(500) DEFAULT NULL COMMENT '撤销证明材料,附件的oss_id,多个用逗号分隔', `apply_time` datetime NOT NULL COMMENT '申请时间', `status` char(1) DEFAULT '1' COMMENT '状态(1-待审核 2-审核通过 3-审核拒绝)', `approval_by` bigint(20) DEFAULT NULL COMMENT '审核人ID', diff --git a/web/src/api/xskh/xsDisciplineRecord/disciplineRecord.ts b/web/src/api/xskh/xsDisciplineRecord/disciplineRecord.ts new file mode 100644 index 00000000..6abbbf9b --- /dev/null +++ b/web/src/api/xskh/xsDisciplineRecord/disciplineRecord.ts @@ -0,0 +1,75 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { DisciplineRecordVO, DisciplineRecordForm, DisciplineRecordQuery, XskhStudentOptionVO } from './xsDisciplineRecord/types'; + +/** + * 查询学生违纪处分记录列表 + * @param query + * @returns {*} + */ + +export const listDisciplineRecord = (query?: DisciplineRecordQuery): AxiosPromise => { + return request({ + url: '/disciplineRecord/disciplineRecord/list', + method: 'get', + params: query + }); +}; + +/** + * 查询学生违纪处分记录详细 + * @param id + */ +export const getDisciplineRecord = (id: string | number): AxiosPromise => { + return request({ + url: '/disciplineRecord/disciplineRecord/' + id, + method: 'get' + }); +}; + +/** + * 新增学生违纪处分记录 + * @param data + */ +export const addDisciplineRecord = (data: DisciplineRecordForm) => { + return request({ + url: '/disciplineRecord/disciplineRecord', + method: 'post', + data: data + }); +}; + +/** + * 修改学生违纪处分记录 + * @param data + */ +export const updateDisciplineRecord = (data: DisciplineRecordForm) => { + return request({ + url: '/disciplineRecord/disciplineRecord', + method: 'put', + data: data + }); +}; + +/** + * 删除学生违纪处分记录 + * @param id + */ +export const delDisciplineRecord = (id: string | number | Array) => { + return request({ + url: '/disciplineRecord/disciplineRecord/' + id, + method: 'delete' + }); +}; + +/** + * 查询学生选项列表(用于下拉框) + * @param keyword + */ +export const getStudentOptions = (keyword?: string): AxiosPromise => { + return request({ + url: '/disciplineRecord/disciplineRecord/studentOptions', + method: 'get', + params: { keyword } + }); +}; diff --git a/web/src/api/xskh/xsDisciplineRecord/xsDisciplineRecord/types.ts b/web/src/api/xskh/xsDisciplineRecord/xsDisciplineRecord/types.ts new file mode 100644 index 00000000..adbbb05f --- /dev/null +++ b/web/src/api/xskh/xsDisciplineRecord/xsDisciplineRecord/types.ts @@ -0,0 +1,403 @@ +import { PageQuery } from '@/types/base'; + +export interface DisciplineRecordVO { + /** + * 主键ID + */ + id: string | number; + + /** + * 学生ID + */ + studentId: string | number; + + /** + * 学号 + */ + studentNo: string; + + /** + * 学生姓名 + */ + studentName: string; + + /** + * 学院ID + */ + collegeId: string | number; + + /** + * 学院名称 + */ + collegeName: string; + + /** + * 专业ID + */ + majorId: string | number; + + /** + * 专业名称 + */ + majorName: string; + + /** + * 班级ID + */ + classId: string | number; + + /** + * 班级名称 + */ + className: string; + + /** + * 违纪处分类型ID + */ + disciplineTypeId: string | number; + + /** + * 违纪处分类型名称 + */ + disciplineTypeName: string; + + /** + * 违纪处分日期 + */ + disciplineDate: string; + + /** + * 违纪处分原因 + */ + disciplineReason: string; + + /** + * 违纪处分内容 + */ + disciplineContent: string; + + /** + * 扣分分值 + */ + scoreDeduction: number; + + /** + * 状态(1-生效 2-已撤销) + */ + status: string; + + /** + * 审批状态(1-已审批 2-审批中) + */ + approvalStatus: string; + + /** + * 审批人ID + */ + approvalBy: string | number; + + /** + * 审批时间 + */ + approvalTime: string; + + /** + * 审批备注 + */ + approvalRemark: string; + + /** + * 附件OSS ID列表,逗号分隔 + */ + attachmentOssIds: string; + + /** + * 创建者 + */ + createBy: string | number; + + /** + * 创建时间 + */ + createTime: string; + + /** + * 更新者 + */ + updateBy: string | number; + + /** + * 更新时间 + */ + updateTime: string; +} + +export interface DisciplineRecordForm { + /** + * 主键ID + */ + id?: string | number; + + /** + * 学生ID + */ + studentId?: string | number; + + /** + * 学号 + */ + studentNo?: string; + + /** + * 学生姓名 + */ + studentName?: string; + + /** + * 学院ID + */ + collegeId?: string | number; + + /** + * 学院名称 + */ + collegeName?: string; + + /** + * 专业ID + */ + majorId?: string | number; + + /** + * 专业名称 + */ + majorName?: string; + + /** + * 班级ID + */ + classId?: string | number; + + /** + * 班级名称 + */ + className?: string; + + /** + * 违纪处分类型ID + */ + disciplineTypeId?: string | number; + + /** + * 违纪处分类型名称 + */ + disciplineTypeName?: string; + + /** + * 违纪处分日期 + */ + disciplineDate?: string; + + /** + * 违纪处分原因 + */ + disciplineReason?: string; + + /** + * 违纪处分内容 + */ + disciplineContent?: string; + + /** + * 扣分分值 + */ + scoreDeduction?: number; + + /** + * 状态(1-生效 2-已撤销) + */ + status?: string; + + /** + * 审批状态(1-已审批 2-审批中) + */ + approvalStatus?: string; + + /** + * 审批人ID + */ + approvalBy?: string | number; + + /** + * 审批时间 + */ + approvalTime?: string; + + /** + * 审批备注 + */ + approvalRemark?: string; + + /** + * 附件OSS ID列表,逗号分隔 + */ + attachmentOssIds?: string; +} + +export interface DisciplineRecordQuery extends PageQuery { + + /** + * 学生ID + */ + studentId?: string | number; + + /** + * 学号 + */ + studentNo?: string; + + /** + * 学生姓名 + */ + studentName?: string; + + /** + * 学院ID + */ + collegeId?: string | number; + + /** + * 学院名称 + */ + collegeName?: string; + + /** + * 专业ID + */ + majorId?: string | number; + + /** + * 专业名称 + */ + majorName?: string; + + /** + * 班级ID + */ + classId?: string | number; + + /** + * 班级名称 + */ + className?: string; + + /** + * 违纪处分类型ID + */ + disciplineTypeId?: string | number; + + /** + * 违纪处分类型名称 + */ + disciplineTypeName?: string; + + /** + * 违纪处分日期 + */ + disciplineDate?: string; + + /** + * 违纪处分原因 + */ + disciplineReason?: string; + + /** + * 违纪处分内容 + */ + disciplineContent?: string; + + /** + * 扣分分值 + */ + scoreDeduction?: number; + + /** + * 状态(1-生效 2-已撤销) + */ + status?: string; + + /** + * 审批状态(1-已审批 2-审批中) + */ + approvalStatus?: string; + + /** + * 审批人ID + */ + approvalBy?: string | number; + + /** + * 审批时间 + */ + approvalTime?: string; + + /** + * 审批备注 + */ + approvalRemark?: string; + + /** + * 日期范围参数 + */ + params?: any; +} + +/** + * 学生考核-学生选项 + */ +export interface XskhStudentOptionVO { + /** + * 学生ID + */ + id: string | number; + + /** + * 学号 + */ + studentNo: string; + + /** + * 学生姓名 + */ + name: string; + + /** + * 学院ID + */ + collegeId: string | number; + + /** + * 学院名称 + */ + collegeName: string; + + /** + * 专业ID + */ + majorId: string | number; + + /** + * 专业名称 + */ + majorName: string; + + /** + * 班级ID + */ + classId: string | number; + + /** + * 班级名称 + */ + className: string; +} diff --git a/web/src/views/xskh/xsDisciplineRecord/DisciplineRecordForm.vue b/web/src/views/xskh/xsDisciplineRecord/DisciplineRecordForm.vue new file mode 100644 index 00000000..5008a38f --- /dev/null +++ b/web/src/views/xskh/xsDisciplineRecord/DisciplineRecordForm.vue @@ -0,0 +1,1006 @@ + + + + + diff --git a/web/src/views/xskh/xsDisciplineRecord/index.vue b/web/src/views/xskh/xsDisciplineRecord/index.vue new file mode 100644 index 00000000..507bed9e --- /dev/null +++ b/web/src/views/xskh/xsDisciplineRecord/index.vue @@ -0,0 +1,321 @@ + + + + +