diff --git a/backend/ruoyi-admin/pom.xml b/backend/ruoyi-admin/pom.xml
index 3817f9f5..982b4ac9 100644
--- a/backend/ruoyi-admin/pom.xml
+++ b/backend/ruoyi-admin/pom.xml
@@ -136,11 +136,11 @@
         </dependency>
 
         <!-- 学生考核管理模块 -->
-        <!-- <dependency>
+        <dependency>
             <groupId>org.dromara</groupId>
             <artifactId>ruoyi-xskh</artifactId>
             <version>${revision}</version>
-        </dependency> -->
+        </dependency>
         <!-- 奖惩补贴管理模块 -->
         <dependency>
             <groupId>org.dromara</groupId>
diff --git a/backend/ruoyi-modules/pom.xml b/backend/ruoyi-modules/pom.xml
index 2983d764..f403571a 100644
--- a/backend/ruoyi-modules/pom.xml
+++ b/backend/ruoyi-modules/pom.xml
@@ -23,6 +23,7 @@
         <module>ruoyi-rs</module>
         <module>ruoyi-xljk</module>
         <module>ruoyi-jcbt</module>
+        <module>ruoyi-xskh</module>
         <!-- <module>ruoyi-stgl</module> -->
     </modules>
 
diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhDisciplineTypeController.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhDisciplineTypeController.java
new file mode 100644
index 00000000..4a345895
--- /dev/null
+++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhDisciplineTypeController.java
@@ -0,0 +1,105 @@
+package org.dromara.xskh.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.xskh.domain.vo.XskhDisciplineTypeVo;
+import org.dromara.xskh.domain.bo.XskhDisciplineTypeBo;
+import org.dromara.xskh.service.IXskhDisciplineTypeService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 学生违纪处分类型
+ *
+ * @author zlwu
+ * @date 2025-08-18
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/disciplineType/disciplineType")
+public class XskhDisciplineTypeController extends BaseController {
+
+    private final IXskhDisciplineTypeService xskhDisciplineTypeService;
+
+    /**
+     * 查询学生违纪处分类型列表
+     */
+    @SaCheckPermission("disciplineType:disciplineType:list")
+    @GetMapping("/list")
+    public TableDataInfo<XskhDisciplineTypeVo> list(XskhDisciplineTypeBo bo, PageQuery pageQuery) {
+        return xskhDisciplineTypeService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出学生违纪处分类型列表
+     */
+    @SaCheckPermission("disciplineType:disciplineType:export")
+    @Log(title = "学生违纪处分类型", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(XskhDisciplineTypeBo bo, HttpServletResponse response) {
+        List<XskhDisciplineTypeVo> list = xskhDisciplineTypeService.queryList(bo);
+        ExcelUtil.exportExcel(list, "学生违纪处分类型", XskhDisciplineTypeVo.class, response);
+    }
+
+    /**
+     * 获取学生违纪处分类型详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("disciplineType:disciplineType:query")
+    @GetMapping("/{id}")
+    public R<XskhDisciplineTypeVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(xskhDisciplineTypeService.queryById(id));
+    }
+
+    /**
+     * 新增学生违纪处分类型
+     */
+    @SaCheckPermission("disciplineType:disciplineType:add")
+    @Log(title = "学生违纪处分类型", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody XskhDisciplineTypeBo bo) {
+        return toAjax(xskhDisciplineTypeService.insertByBo(bo));
+    }
+
+    /**
+     * 修改学生违纪处分类型
+     */
+    @SaCheckPermission("disciplineType:disciplineType:edit")
+    @Log(title = "学生违纪处分类型", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody XskhDisciplineTypeBo bo) {
+        return toAjax(xskhDisciplineTypeService.updateByBo(bo));
+    }
+
+    /**
+     * 删除学生违纪处分类型
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("disciplineType:disciplineType:remove")
+    @Log(title = "学生违纪处分类型", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(xskhDisciplineTypeService.deleteWithValidByIds(List.of(ids), true));
+    }
+}
diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhRewardTypeController.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhRewardTypeController.java
new file mode 100644
index 00000000..0a74a6a1
--- /dev/null
+++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhRewardTypeController.java
@@ -0,0 +1,105 @@
+package org.dromara.xskh.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.xskh.domain.vo.XskhRewardTypeVo;
+import org.dromara.xskh.domain.bo.XskhRewardTypeBo;
+import org.dromara.xskh.service.IXskhRewardTypeService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 学生奖励类型
+ *
+ * @author Lion Li
+ * @date 2025-08-18
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/rewardType/rewardType")
+public class XskhRewardTypeController extends BaseController {
+
+    private final IXskhRewardTypeService xskhRewardTypeService;
+
+    /**
+     * 查询学生奖励类型列表
+     */
+    @SaCheckPermission("rewardType:rewardType:list")
+    @GetMapping("/list")
+    public TableDataInfo<XskhRewardTypeVo> list(XskhRewardTypeBo bo, PageQuery pageQuery) {
+        return xskhRewardTypeService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出学生奖励类型列表
+     */
+    @SaCheckPermission("rewardType:rewardType:export")
+    @Log(title = "学生奖励类型", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(XskhRewardTypeBo bo, HttpServletResponse response) {
+        List<XskhRewardTypeVo> list = xskhRewardTypeService.queryList(bo);
+        ExcelUtil.exportExcel(list, "学生奖励类型", XskhRewardTypeVo.class, response);
+    }
+
+    /**
+     * 获取学生奖励类型详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("rewardType:rewardType:query")
+    @GetMapping("/{id}")
+    public R<XskhRewardTypeVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(xskhRewardTypeService.queryById(id));
+    }
+
+    /**
+     * 新增学生奖励类型
+     */
+    @SaCheckPermission("rewardType:rewardType:add")
+    @Log(title = "学生奖励类型", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody XskhRewardTypeBo bo) {
+        return toAjax(xskhRewardTypeService.insertByBo(bo));
+    }
+
+    /**
+     * 修改学生奖励类型
+     */
+    @SaCheckPermission("rewardType:rewardType:edit")
+    @Log(title = "学生奖励类型", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody XskhRewardTypeBo bo) {
+        return toAjax(xskhRewardTypeService.updateByBo(bo));
+    }
+
+    /**
+     * 删除学生奖励类型
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("rewardType:rewardType:remove")
+    @Log(title = "学生奖励类型", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(xskhRewardTypeService.deleteWithValidByIds(List.of(ids), true));
+    }
+}
diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/XskhDisciplineType.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/XskhDisciplineType.java
new file mode 100644
index 00000000..62342129
--- /dev/null
+++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/XskhDisciplineType.java
@@ -0,0 +1,67 @@
+package org.dromara.xskh.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 学生违纪处分类型对象 xskh_discipline_type
+ *
+ * @author zlwu
+ * @date 2025-08-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("xskh_discipline_type")
+public class XskhDisciplineType extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 类型编码
+     */
+    private String typeCode;
+
+    /**
+     * 类型名称
+     */
+    private String typeName;
+
+    /**
+     * 类型分类(1-违纪类型 2-处分类型)
+     */
+    private String typeCategory;
+
+    /**
+     * 类型说明
+     */
+    private String remark;
+
+    /**
+     * 状态(0-正常 1-停用)
+     */
+    private String status;
+
+    /**
+     * 排序号
+     */
+    private Long sortOrder;
+
+    /**
+     * 删除标志(0-未删除 1-已删除)
+     */
+    @TableLogic(value = "0", delval = "1")
+    private Long deleted;
+
+
+}
diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/XskhRewardType.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/XskhRewardType.java
new file mode 100644
index 00000000..b9086710
--- /dev/null
+++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/XskhRewardType.java
@@ -0,0 +1,62 @@
+package org.dromara.xskh.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 学生奖励类型对象 xskh_reward_type
+ *
+ * @author Lion Li
+ * @date 2025-08-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("xskh_reward_type")
+public class XskhRewardType extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 类型编码
+     */
+    private String typeCode;
+
+    /**
+     * 类型名称
+     */
+    private String typeName;
+
+    /**
+     * 类型说明
+     */
+    private String description;
+
+    /**
+     * 状态(0-正常 1-停用)
+     */
+    private String status;
+
+    /**
+     * 排序号
+     */
+    private Long sortOrder;
+
+    /**
+     * 删除标志(0-未删除 1-已删除)
+     */
+    @TableLogic(value = "0", delval = "1")
+    private Long deleted;
+
+
+}
diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/bo/XskhDisciplineTypeBo.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/bo/XskhDisciplineTypeBo.java
new file mode 100644
index 00000000..5071a839
--- /dev/null
+++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/bo/XskhDisciplineTypeBo.java
@@ -0,0 +1,68 @@
+package org.dromara.xskh.domain.bo;
+
+import org.dromara.xskh.domain.XskhDisciplineType;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 学生违纪处分类型业务对象 xskh_discipline_type
+ *
+ * @author zlwu
+ * @date 2025-08-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = XskhDisciplineType.class, reverseConvertGenerate = false)
+public class XskhDisciplineTypeBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 类型编码
+     */
+    @NotBlank(message = "类型编码不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String typeCode;
+
+    /**
+     * 类型名称
+     */
+    @NotBlank(message = "类型名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String typeName;
+
+    /**
+     * 类型分类(1-违纪类型 2-处分类型)
+     */
+    @NotBlank(message = "类型分类(1-违纪类型 2-处分类型)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String typeCategory;
+
+    /**
+     * 类型说明
+     */
+    private String remark;
+
+    /**
+     * 状态(0-正常 1-停用)
+     */
+    private String status;
+
+    /**
+     * 排序号
+     */
+    private Long sortOrder;
+
+    /**
+     * 删除标志(0-未删除 1-已删除)
+     */
+    private Long deleted;
+
+
+}
diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/bo/XskhRewardTypeBo.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/bo/XskhRewardTypeBo.java
new file mode 100644
index 00000000..e4c557e3
--- /dev/null
+++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/bo/XskhRewardTypeBo.java
@@ -0,0 +1,62 @@
+package org.dromara.xskh.domain.bo;
+
+import org.dromara.xskh.domain.XskhRewardType;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 学生奖励类型业务对象 xskh_reward_type
+ *
+ * @author Lion Li
+ * @date 2025-08-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = XskhRewardType.class, reverseConvertGenerate = false)
+public class XskhRewardTypeBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 类型编码
+     */
+    @NotBlank(message = "类型编码不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String typeCode;
+
+    /**
+     * 类型名称
+     */
+    @NotBlank(message = "类型名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String typeName;
+
+    /**
+     * 类型说明
+     */
+    private String description;
+
+    /**
+     * 状态(0-正常 1-停用)
+     */
+    private String status;
+
+    /**
+     * 排序号
+     */
+    private Long sortOrder;
+
+    /**
+     * 删除标志(0-未删除 1-已删除)
+     */
+    private Long deleted;
+
+
+}
diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/vo/XskhDisciplineTypeVo.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/vo/XskhDisciplineTypeVo.java
new file mode 100644
index 00000000..426425f9
--- /dev/null
+++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/vo/XskhDisciplineTypeVo.java
@@ -0,0 +1,82 @@
+package org.dromara.xskh.domain.vo;
+
+import org.dromara.xskh.domain.XskhDisciplineType;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 学生违纪处分类型视图对象 xskh_discipline_type
+ *
+ * @author zlwu
+ * @date 2025-08-18
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = XskhDisciplineType.class)
+public class XskhDisciplineTypeVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 类型编码
+     */
+    @ExcelProperty(value = "类型编码")
+    private String typeCode;
+
+    /**
+     * 类型名称
+     */
+    @ExcelProperty(value = "类型名称")
+    private String typeName;
+
+    /**
+     * 类型分类(1-违纪类型 2-处分类型)
+     */
+    @ExcelProperty(value = "类型分类(1-违纪类型 2-处分类型)", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "student_discipline_category")
+    private String typeCategory;
+
+    /**
+     * 类型说明
+     */
+    @ExcelProperty(value = "类型说明")
+    private String remark;
+
+    /**
+     * 状态(0-正常 1-停用)
+     */
+    @ExcelProperty(value = "状态(0-正常 1-停用)", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_msg_status")
+    private String status;
+
+    /**
+     * 排序号
+     */
+    @ExcelProperty(value = "排序号")
+    private Long sortOrder;
+
+    /**
+     * 删除标志(0-未删除 1-已删除)
+     */
+    @ExcelProperty(value = "删除标志(0-未删除 1-已删除)")
+    private Long deleted;
+
+
+}
diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/vo/XskhRewardTypeVo.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/vo/XskhRewardTypeVo.java
new file mode 100644
index 00000000..fd17fdbd
--- /dev/null
+++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/domain/vo/XskhRewardTypeVo.java
@@ -0,0 +1,75 @@
+package org.dromara.xskh.domain.vo;
+
+import org.dromara.xskh.domain.XskhRewardType;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 学生奖励类型视图对象 xskh_reward_type
+ *
+ * @author Lion Li
+ * @date 2025-08-18
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = XskhRewardType.class)
+public class XskhRewardTypeVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 类型编码
+     */
+    @ExcelProperty(value = "类型编码")
+    private String typeCode;
+
+    /**
+     * 类型名称
+     */
+    @ExcelProperty(value = "类型名称")
+    private String typeName;
+
+    /**
+     * 类型说明
+     */
+    @ExcelProperty(value = "类型说明")
+    private String description;
+
+    /**
+     * 状态(0-正常 1-停用)
+     */
+    @ExcelProperty(value = "状态(0-正常 1-停用)", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_msg_status")
+    private String status;
+
+    /**
+     * 排序号
+     */
+    @ExcelProperty(value = "排序号")
+    private Long sortOrder;
+
+    /**
+     * 删除标志(0-未删除 1-已删除)
+     */
+    @ExcelProperty(value = "删除标志(0-未删除 1-已删除)")
+    private Long deleted;
+
+
+}
diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/mapper/XskhDisciplineTypeMapper.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/mapper/XskhDisciplineTypeMapper.java
new file mode 100644
index 00000000..c3d3893f
--- /dev/null
+++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/mapper/XskhDisciplineTypeMapper.java
@@ -0,0 +1,15 @@
+package org.dromara.xskh.mapper;
+
+import org.dromara.xskh.domain.XskhDisciplineType;
+import org.dromara.xskh.domain.vo.XskhDisciplineTypeVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 学生违纪处分类型Mapper接口
+ *
+ * @author zlwu
+ * @date 2025-08-18
+ */
+public interface XskhDisciplineTypeMapper extends BaseMapperPlus<XskhDisciplineType, XskhDisciplineTypeVo> {
+
+}
diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/mapper/XskhRewardTypeMapper.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/mapper/XskhRewardTypeMapper.java
new file mode 100644
index 00000000..7b264901
--- /dev/null
+++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/mapper/XskhRewardTypeMapper.java
@@ -0,0 +1,15 @@
+package org.dromara.xskh.mapper;
+
+import org.dromara.xskh.domain.XskhRewardType;
+import org.dromara.xskh.domain.vo.XskhRewardTypeVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 学生奖励类型Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-08-18
+ */
+public interface XskhRewardTypeMapper extends BaseMapperPlus<XskhRewardType, XskhRewardTypeVo> {
+
+}
diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/service/IXskhDisciplineTypeService.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/service/IXskhDisciplineTypeService.java
new file mode 100644
index 00000000..c3f5af26
--- /dev/null
+++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/service/IXskhDisciplineTypeService.java
@@ -0,0 +1,68 @@
+package org.dromara.xskh.service;
+
+import org.dromara.xskh.domain.vo.XskhDisciplineTypeVo;
+import org.dromara.xskh.domain.bo.XskhDisciplineTypeBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 学生违纪处分类型Service接口
+ *
+ * @author zlwu
+ * @date 2025-08-18
+ */
+public interface IXskhDisciplineTypeService {
+
+    /**
+     * 查询学生违纪处分类型
+     *
+     * @param id 主键
+     * @return 学生违纪处分类型
+     */
+    XskhDisciplineTypeVo queryById(Long id);
+
+    /**
+     * 分页查询学生违纪处分类型列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 学生违纪处分类型分页列表
+     */
+    TableDataInfo<XskhDisciplineTypeVo> queryPageList(XskhDisciplineTypeBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的学生违纪处分类型列表
+     *
+     * @param bo 查询条件
+     * @return 学生违纪处分类型列表
+     */
+    List<XskhDisciplineTypeVo> queryList(XskhDisciplineTypeBo bo);
+
+    /**
+     * 新增学生违纪处分类型
+     *
+     * @param bo 学生违纪处分类型
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(XskhDisciplineTypeBo bo);
+
+    /**
+     * 修改学生违纪处分类型
+     *
+     * @param bo 学生违纪处分类型
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(XskhDisciplineTypeBo bo);
+
+    /**
+     * 校验并批量删除学生违纪处分类型信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}
diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/service/IXskhRewardTypeService.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/service/IXskhRewardTypeService.java
new file mode 100644
index 00000000..917eaf11
--- /dev/null
+++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/service/IXskhRewardTypeService.java
@@ -0,0 +1,68 @@
+package org.dromara.xskh.service;
+
+import org.dromara.xskh.domain.vo.XskhRewardTypeVo;
+import org.dromara.xskh.domain.bo.XskhRewardTypeBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 学生奖励类型Service接口
+ *
+ * @author Lion Li
+ * @date 2025-08-18
+ */
+public interface IXskhRewardTypeService {
+
+    /**
+     * 查询学生奖励类型
+     *
+     * @param id 主键
+     * @return 学生奖励类型
+     */
+    XskhRewardTypeVo queryById(Long id);
+
+    /**
+     * 分页查询学生奖励类型列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 学生奖励类型分页列表
+     */
+    TableDataInfo<XskhRewardTypeVo> queryPageList(XskhRewardTypeBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的学生奖励类型列表
+     *
+     * @param bo 查询条件
+     * @return 学生奖励类型列表
+     */
+    List<XskhRewardTypeVo> queryList(XskhRewardTypeBo bo);
+
+    /**
+     * 新增学生奖励类型
+     *
+     * @param bo 学生奖励类型
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(XskhRewardTypeBo bo);
+
+    /**
+     * 修改学生奖励类型
+     *
+     * @param bo 学生奖励类型
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(XskhRewardTypeBo bo);
+
+    /**
+     * 校验并批量删除学生奖励类型信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}
diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/service/impl/XskhDisciplineTypeServiceImpl.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/service/impl/XskhDisciplineTypeServiceImpl.java
new file mode 100644
index 00000000..fa2bf457
--- /dev/null
+++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/service/impl/XskhDisciplineTypeServiceImpl.java
@@ -0,0 +1,137 @@
+package org.dromara.xskh.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.dromara.xskh.domain.bo.XskhDisciplineTypeBo;
+import org.dromara.xskh.domain.vo.XskhDisciplineTypeVo;
+import org.dromara.xskh.domain.XskhDisciplineType;
+import org.dromara.xskh.mapper.XskhDisciplineTypeMapper;
+import org.dromara.xskh.service.IXskhDisciplineTypeService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 学生违纪处分类型Service业务层处理
+ *
+ * @author zlwu
+ * @date 2025-08-18
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class XskhDisciplineTypeServiceImpl implements IXskhDisciplineTypeService {
+
+    private final XskhDisciplineTypeMapper baseMapper;
+
+    /**
+     * 查询学生违纪处分类型
+     *
+     * @param id 主键
+     * @return 学生违纪处分类型
+     */
+    @Override
+    public XskhDisciplineTypeVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询学生违纪处分类型列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 学生违纪处分类型分页列表
+     */
+    @Override
+    public TableDataInfo<XskhDisciplineTypeVo> queryPageList(XskhDisciplineTypeBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<XskhDisciplineType> lqw = buildQueryWrapper(bo);
+        Page<XskhDisciplineTypeVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的学生违纪处分类型列表
+     *
+     * @param bo 查询条件
+     * @return 学生违纪处分类型列表
+     */
+    @Override
+    public List<XskhDisciplineTypeVo> queryList(XskhDisciplineTypeBo bo) {
+        LambdaQueryWrapper<XskhDisciplineType> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<XskhDisciplineType> buildQueryWrapper(XskhDisciplineTypeBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<XskhDisciplineType> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(XskhDisciplineType::getId);
+        lqw.eq(StringUtils.isNotBlank(bo.getTypeCode()), XskhDisciplineType::getTypeCode, bo.getTypeCode());
+        lqw.like(StringUtils.isNotBlank(bo.getTypeName()), XskhDisciplineType::getTypeName, bo.getTypeName());
+        lqw.eq(StringUtils.isNotBlank(bo.getTypeCategory()), XskhDisciplineType::getTypeCategory, bo.getTypeCategory());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), XskhDisciplineType::getStatus, bo.getStatus());
+        lqw.eq(bo.getSortOrder() != null, XskhDisciplineType::getSortOrder, bo.getSortOrder());
+        lqw.eq(bo.getDeleted() != null, XskhDisciplineType::getDeleted, bo.getDeleted());
+        return lqw;
+    }
+
+    /**
+     * 新增学生违纪处分类型
+     *
+     * @param bo 学生违纪处分类型
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(XskhDisciplineTypeBo bo) {
+        XskhDisciplineType add = MapstructUtils.convert(bo, XskhDisciplineType.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改学生违纪处分类型
+     *
+     * @param bo 学生违纪处分类型
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(XskhDisciplineTypeBo bo) {
+        XskhDisciplineType update = MapstructUtils.convert(bo, XskhDisciplineType.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(XskhDisciplineType entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除学生违纪处分类型信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}
diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/service/impl/XskhRewardTypeServiceImpl.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/service/impl/XskhRewardTypeServiceImpl.java
new file mode 100644
index 00000000..cb0ea0eb
--- /dev/null
+++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/service/impl/XskhRewardTypeServiceImpl.java
@@ -0,0 +1,137 @@
+package org.dromara.xskh.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.dromara.xskh.domain.bo.XskhRewardTypeBo;
+import org.dromara.xskh.domain.vo.XskhRewardTypeVo;
+import org.dromara.xskh.domain.XskhRewardType;
+import org.dromara.xskh.mapper.XskhRewardTypeMapper;
+import org.dromara.xskh.service.IXskhRewardTypeService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 学生奖励类型Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2025-08-18
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class XskhRewardTypeServiceImpl implements IXskhRewardTypeService {
+
+    private final XskhRewardTypeMapper baseMapper;
+
+    /**
+     * 查询学生奖励类型
+     *
+     * @param id 主键
+     * @return 学生奖励类型
+     */
+    @Override
+    public XskhRewardTypeVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询学生奖励类型列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 学生奖励类型分页列表
+     */
+    @Override
+    public TableDataInfo<XskhRewardTypeVo> queryPageList(XskhRewardTypeBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<XskhRewardType> lqw = buildQueryWrapper(bo);
+        Page<XskhRewardTypeVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的学生奖励类型列表
+     *
+     * @param bo 查询条件
+     * @return 学生奖励类型列表
+     */
+    @Override
+    public List<XskhRewardTypeVo> queryList(XskhRewardTypeBo bo) {
+        LambdaQueryWrapper<XskhRewardType> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<XskhRewardType> buildQueryWrapper(XskhRewardTypeBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<XskhRewardType> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(XskhRewardType::getId);
+        lqw.eq(StringUtils.isNotBlank(bo.getTypeCode()), XskhRewardType::getTypeCode, bo.getTypeCode());
+        lqw.like(StringUtils.isNotBlank(bo.getTypeName()), XskhRewardType::getTypeName, bo.getTypeName());
+        lqw.like(StringUtils.isNotBlank(bo.getDescription()), XskhRewardType::getDescription, bo.getDescription());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), XskhRewardType::getStatus, bo.getStatus());
+        lqw.eq(bo.getSortOrder() != null, XskhRewardType::getSortOrder, bo.getSortOrder());
+        lqw.eq(bo.getDeleted() != null, XskhRewardType::getDeleted, bo.getDeleted());
+        return lqw;
+    }
+
+    /**
+     * 新增学生奖励类型
+     *
+     * @param bo 学生奖励类型
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(XskhRewardTypeBo bo) {
+        XskhRewardType add = MapstructUtils.convert(bo, XskhRewardType.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改学生奖励类型
+     *
+     * @param bo 学生奖励类型
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(XskhRewardTypeBo bo) {
+        XskhRewardType update = MapstructUtils.convert(bo, XskhRewardType.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(XskhRewardType entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除学生奖励类型信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}
diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/resources/mapper/disciplineType/XskhDisciplineTypeMapper.xml b/backend/ruoyi-modules/ruoyi-xskh/src/main/resources/mapper/disciplineType/XskhDisciplineTypeMapper.xml
new file mode 100644
index 00000000..e0155dd7
--- /dev/null
+++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/resources/mapper/disciplineType/XskhDisciplineTypeMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.xskh.mapper.XskhDisciplineTypeMapper">
+
+</mapper>
diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/resources/mapper/rewardType/XskhRewardTypeMapper.xml b/backend/ruoyi-modules/ruoyi-xskh/src/main/resources/mapper/rewardType/XskhRewardTypeMapper.xml
new file mode 100644
index 00000000..e3747ed3
--- /dev/null
+++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/resources/mapper/rewardType/XskhRewardTypeMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.xskh.mapper.XskhRewardTypeMapper">
+
+</mapper>
diff --git a/docs/设计文档/database/学生考核管理/学生考核管理字典数据.sql b/docs/设计文档/database/学生考核管理/学生考核管理字典数据.sql
index abe7b352..6a26b7fc 100644
--- a/docs/设计文档/database/学生考核管理/学生考核管理字典数据.sql
+++ b/docs/设计文档/database/学生考核管理/学生考核管理字典数据.sql
@@ -18,8 +18,7 @@ INSERT INTO `sys_dict_type` (`id`, `dict_name`, `dict_type`, `status`, `create_b
 
 INSERT INTO `sys_dict_data` (`id`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES
 (10003, 1, '生效', '1', 'student_discipline_status', '', 'success', 'Y', '0', 1, NOW(), NULL, NULL, '违纪处分记录生效'),
-(10004, 2, '撤销申请中', '2', 'student_discipline_status', '', 'warning', 'N', '0', 1, NOW(), NULL, NULL, '撤销申请审核中'),
-(10005, 3, '已撤销', '3', 'student_discipline_status', '', 'info', 'N', '0', 1, NOW(), NULL, NULL, '违纪处分记录已撤销');
+(10005, 2, '已撤销', '2', 'student_discipline_status', '', 'info', 'N', '0', 1, NOW(), NULL, NULL, '违纪处分记录已撤销');
 
 -- 3. 撤销申请状态字典
 INSERT INTO `sys_dict_type` (`id`, `dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES
@@ -30,17 +29,6 @@ INSERT INTO `sys_dict_data` (`id`, `dict_sort`, `dict_label`, `dict_value`, `dic
 (10007, 2, '审核通过', '2', 'student_revoke_status', '', 'success', 'N', '0', 1, NOW(), NULL, NULL, '撤销申请审核通过'),
 (10008, 3, '审核拒绝', '3', 'student_revoke_status', '', 'danger', 'N', '0', 1, NOW(), NULL, NULL, '撤销申请审核拒绝');
 
--- 4. 考核指标类型字典
-INSERT INTO `sys_dict_type` (`id`, `dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES
-(1004, '考核指标类型', 'student_indicator_type', '0', 1, NOW(), NULL, NULL, '学生考核指标类型');
-
-INSERT INTO `sys_dict_data` (`id`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES
-(10009, 1, '德育', '1', 'student_indicator_type', '', 'primary', 'Y', '0', 1, NOW(), NULL, NULL, '德育指标'),
-(10010, 2, '智育', '2', 'student_indicator_type', '', 'success', 'N', '0', 1, NOW(), NULL, NULL, '智育指标'),
-(10011, 3, '体育', '3', 'student_indicator_type', '', 'warning', 'N', '0', 1, NOW(), NULL, NULL, '体育指标'),
-(10012, 4, '美育', '4', 'student_indicator_type', '', 'info', 'N', '0', 1, NOW(), NULL, NULL, '美育指标'),
-(10013, 5, '劳动', '5', 'student_indicator_type', '', 'danger', 'N', '0', 1, NOW(), NULL, NULL, '劳动指标');
-
 -- 5. 考核计划状态字典
 INSERT INTO `sys_dict_type` (`id`, `dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES
 (1005, '考核计划状态', 'student_schedule_status', '0', 1, NOW(), NULL, NULL, '学生考核计划状态');
@@ -58,8 +46,6 @@ INSERT INTO `sys_dict_data` (`id`, `dict_sort`, `dict_label`, `dict_value`, `dic
 (10017, 1, '草稿', '1', 'student_assessment_status', '', 'info', 'Y', '0', 1, NOW(), NULL, NULL, '考核申请草稿'),
 (10018, 2, '已提交', '2', 'student_assessment_status', '', 'primary', 'N', '0', 1, NOW(), NULL, NULL, '考核申请已提交'),
 (10019, 3, '班主任审核', '3', 'student_assessment_status', '', 'warning', 'N', '0', 1, NOW(), NULL, NULL, '班主任审核中'),
-(10020, 4, '学院审核', '4', 'student_assessment_status', '', 'warning', 'N', '0', 1, NOW(), NULL, NULL, '学院审核中'),
-(10021, 5, '学校审核', '5', 'student_assessment_status', '', 'warning', 'N', '0', 1, NOW(), NULL, NULL, '学校审核中'),
 (10022, 6, '已完成', '6', 'student_assessment_status', '', 'success', 'N', '0', 1, NOW(), NULL, NULL, '考核申请已完成');
 
 -- 7. 附加分审核状态字典
@@ -81,8 +67,8 @@ INSERT INTO `sys_dict_data` (`id`, `dict_sort`, `dict_label`, `dict_value`, `dic
 
 -- 9. 通用状态字典（启用/禁用）
 INSERT INTO `sys_dict_type` (`id`, `dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES
-(1009, '通用状态', 'common_status', '0', 1, NOW(), NULL, NULL, '通用启用禁用状态');
+(1009, '通用状态', 'sys_msg_status', '0', 1, NOW(), NULL, NULL, '通用启用禁用状态');
 
 INSERT INTO `sys_dict_data` (`id`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES
-(10028, 1, '启用', '0', 'common_status', '', 'success', 'Y', '0', 1, NOW(), NULL, NULL, '启用状态'),
-(10029, 2, '禁用', '1', 'common_status', '', 'danger', 'N', '0', 1, NOW(), NULL, NULL, '禁用状态'); 
\ No newline at end of file
+(10028, 1, '启用', '0', 'sys_msg_status', '', 'success', 'Y', '0', 1, NOW(), NULL, NULL, '启用状态'),
+(10029, 2, '禁用', '1', 'sys_msg_status', '', 'danger', 'N', '0', 1, NOW(), NULL, NULL, '禁用状态');
\ No newline at end of file
diff --git a/web/src/api/xskh/disciplineType/disciplineType/index.ts b/web/src/api/xskh/disciplineType/disciplineType/index.ts
new file mode 100644
index 00000000..33c1cbaa
--- /dev/null
+++ b/web/src/api/xskh/disciplineType/disciplineType/index.ts
@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { DisciplineTypeVO, DisciplineTypeForm, DisciplineTypeQuery } from '@/api/xskh/disciplineType/disciplineType/types';
+
+/**
+ * 查询学生违纪处分类型列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listDisciplineType = (query?: DisciplineTypeQuery): AxiosPromise<DisciplineTypeVO[]> => {
+  return request({
+    url: '/disciplineType/disciplineType/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询学生违纪处分类型详细
+ * @param id
+ */
+export const getDisciplineType = (id: string | number): AxiosPromise<DisciplineTypeVO> => {
+  return request({
+    url: '/disciplineType/disciplineType/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增学生违纪处分类型
+ * @param data
+ */
+export const addDisciplineType = (data: DisciplineTypeForm) => {
+  return request({
+    url: '/disciplineType/disciplineType',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改学生违纪处分类型
+ * @param data
+ */
+export const updateDisciplineType = (data: DisciplineTypeForm) => {
+  return request({
+    url: '/disciplineType/disciplineType',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除学生违纪处分类型
+ * @param id
+ */
+export const delDisciplineType = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/disciplineType/disciplineType/' + id,
+    method: 'delete'
+  });
+};
diff --git a/web/src/api/xskh/disciplineType/disciplineType/types.ts b/web/src/api/xskh/disciplineType/disciplineType/types.ts
new file mode 100644
index 00000000..802b922b
--- /dev/null
+++ b/web/src/api/xskh/disciplineType/disciplineType/types.ts
@@ -0,0 +1,126 @@
+export interface DisciplineTypeVO {
+  /**
+   * 主键ID
+   */
+  id: string | number;
+
+  /**
+   * 类型编码
+   */
+  typeCode: string;
+
+  /**
+   * 类型名称
+   */
+  typeName: string;
+
+  /**
+   * 类型分类(1-违纪类型 2-处分类型)
+   */
+  typeCategory: string;
+
+  /**
+   * 类型说明
+   */
+  remark: string;
+
+  /**
+   * 状态(0-正常 1-停用)
+   */
+  status: string;
+
+  /**
+   * 排序号
+   */
+  sortOrder: number;
+
+  /**
+   * 删除标志(0-未删除 1-已删除)
+   */
+  deleted: number;
+
+}
+
+export interface DisciplineTypeForm extends BaseEntity {
+  /**
+   * 主键ID
+   */
+  id?: string | number;
+
+  /**
+   * 类型编码
+   */
+  typeCode?: string;
+
+  /**
+   * 类型名称
+   */
+  typeName?: string;
+
+  /**
+   * 类型分类(1-违纪类型 2-处分类型)
+   */
+  typeCategory?: string;
+
+  /**
+   * 类型说明
+   */
+  remark?: string;
+
+  /**
+   * 状态(0-正常 1-停用)
+   */
+  status?: string;
+
+  /**
+   * 排序号
+   */
+  sortOrder?: number;
+
+  /**
+   * 删除标志(0-未删除 1-已删除)
+   */
+  deleted?: number;
+
+}
+
+export interface DisciplineTypeQuery extends PageQuery {
+
+  /**
+   * 类型编码
+   */
+  typeCode?: string;
+
+  /**
+   * 类型名称
+   */
+  typeName?: string;
+
+  /**
+   * 类型分类(1-违纪类型 2-处分类型)
+   */
+  typeCategory?: string;
+
+  /**
+   * 状态(0-正常 1-停用)
+   */
+  status?: string;
+
+  /**
+   * 排序号
+   */
+  sortOrder?: number;
+
+  /**
+   * 删除标志(0-未删除 1-已删除)
+   */
+  deleted?: number;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+
diff --git a/web/src/api/xskh/rewardType/rewardType/index.ts b/web/src/api/xskh/rewardType/rewardType/index.ts
new file mode 100644
index 00000000..cb281476
--- /dev/null
+++ b/web/src/api/xskh/rewardType/rewardType/index.ts
@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { RewardTypeVO, RewardTypeForm, RewardTypeQuery } from '@/api/xskh/rewardType/rewardType/types';
+
+/**
+ * 查询学生奖励类型列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listRewardType = (query?: RewardTypeQuery): AxiosPromise<RewardTypeVO[]> => {
+  return request({
+    url: '/rewardType/rewardType/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询学生奖励类型详细
+ * @param id
+ */
+export const getRewardType = (id: string | number): AxiosPromise<RewardTypeVO> => {
+  return request({
+    url: '/rewardType/rewardType/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增学生奖励类型
+ * @param data
+ */
+export const addRewardType = (data: RewardTypeForm) => {
+  return request({
+    url: '/rewardType/rewardType',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改学生奖励类型
+ * @param data
+ */
+export const updateRewardType = (data: RewardTypeForm) => {
+  return request({
+    url: '/rewardType/rewardType',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除学生奖励类型
+ * @param id
+ */
+export const delRewardType = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/rewardType/rewardType/' + id,
+    method: 'delete'
+  });
+};
diff --git a/web/src/api/xskh/rewardType/rewardType/types.ts b/web/src/api/xskh/rewardType/rewardType/types.ts
new file mode 100644
index 00000000..1fdff1d8
--- /dev/null
+++ b/web/src/api/xskh/rewardType/rewardType/types.ts
@@ -0,0 +1,116 @@
+export interface RewardTypeVO {
+  /**
+   * 主键ID
+   */
+  id: string | number;
+
+  /**
+   * 类型编码
+   */
+  typeCode: string;
+
+  /**
+   * 类型名称
+   */
+  typeName: string;
+
+  /**
+   * 类型说明
+   */
+  description: string;
+
+  /**
+   * 状态(0-正常 1-停用)
+   */
+  status: string;
+
+  /**
+   * 排序号
+   */
+  sortOrder: number;
+
+  /**
+   * 删除标志(0-未删除 1-已删除)
+   */
+  deleted: number;
+
+}
+
+export interface RewardTypeForm extends BaseEntity {
+  /**
+   * 主键ID
+   */
+  id?: string | number;
+
+  /**
+   * 类型编码
+   */
+  typeCode?: string;
+
+  /**
+   * 类型名称
+   */
+  typeName?: string;
+
+  /**
+   * 类型说明
+   */
+  description?: string;
+
+  /**
+   * 状态(0-正常 1-停用)
+   */
+  status?: string;
+
+  /**
+   * 排序号
+   */
+  sortOrder?: number;
+
+  /**
+   * 删除标志(0-未删除 1-已删除)
+   */
+  deleted?: number;
+
+}
+
+export interface RewardTypeQuery extends PageQuery {
+
+  /**
+   * 类型编码
+   */
+  typeCode?: string;
+
+  /**
+   * 类型名称
+   */
+  typeName?: string;
+
+  /**
+   * 类型说明
+   */
+  description?: string;
+
+  /**
+   * 状态(0-正常 1-停用)
+   */
+  status?: string;
+
+  /**
+   * 排序号
+   */
+  sortOrder?: number;
+
+  /**
+   * 删除标志(0-未删除 1-已删除)
+   */
+  deleted?: number;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+
diff --git a/web/src/views/xskh/disciplineType/index.vue b/web/src/views/xskh/disciplineType/index.vue
new file mode 100644
index 00000000..214d48fe
--- /dev/null
+++ b/web/src/views/xskh/disciplineType/index.vue
@@ -0,0 +1,343 @@
+<template>
+  <div class="p-2 page-container">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams">
+            <el-row :gutter="20">
+              <el-col :span="6">
+                <el-form-item label="类型编码" prop="typeCode">
+                  <el-input v-model="queryParams.typeCode" placeholder="请输入类型编码" clearable @keyup.enter="handleQuery" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="类型名称" prop="typeName">
+                  <el-input v-model="queryParams.typeName" placeholder="请输入类型名称" clearable @keyup.enter="handleQuery" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="类型分类" prop="typeCategory">
+                  <el-select v-model="queryParams.typeCategory" placeholder="请选择类型分类" clearable>
+                    <el-option v-for="dict in student_discipline_category" :key="dict.value" :label="dict.label" :value="dict.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="状态" prop="status">
+                  <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
+                    <el-option v-for="dict in sys_msg_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <!-- <el-form-item label="排序号" prop="sortOrder">
+              <el-input v-model="queryParams.sortOrder" placeholder="请输入排序号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="删除标志(0-未删除 1-已删除)" prop="deleted">
+              <el-input v-model="queryParams.deleted" placeholder="请输入删除标志(0-未删除 1-已删除)" clearable @keyup.enter="handleQuery" />
+            </el-form-item> -->
+            <el-row>
+              <el-col :span="24" class="search-btn-container">
+                <el-form-item>
+                  <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                  <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['disciplineType:disciplineType:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['disciplineType:disciplineType:edit']"
+              >修改</el-button
+            >
+          </el-col>
+          <!-- <el-col :span="1.5">
+            <el-button
+              type="danger"
+              plain
+              icon="Delete"
+              :disabled="multiple"
+              @click="handleDelete()"
+              v-hasPermi="['disciplineType:disciplineType:remove']"
+              >删除</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['disciplineType:disciplineType:export']"
+              >导出</el-button
+            >
+          </el-col> -->
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" border :data="disciplineTypeList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="主键ID" align="center" prop="id" v-if="true" />
+        <el-table-column label="类型编码" align="center" prop="typeCode" />
+        <el-table-column label="类型名称" align="center" prop="typeName" />
+        <el-table-column label="类型分类" align="center" prop="typeCategory">
+          <template #default="scope">
+            <dict-tag :options="student_discipline_category" :value="scope.row.typeCategory" />
+          </template>
+        </el-table-column>
+        <el-table-column label="类型说明" align="center" prop="remark" />
+        <el-table-column label="状态" align="center" prop="status">
+          <template #default="scope">
+            <dict-tag :options="sys_msg_status" :value="scope.row.status" />
+          </template>
+        </el-table-column>
+        <el-table-column label="排序号" align="center" prop="sortOrder" />
+        <!-- <el-table-column label="删除标志(0-未删除 1-已删除)" align="center" prop="deleted" /> -->
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button
+                link
+                type="primary"
+                icon="Edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['disciplineType:disciplineType:edit']"
+              ></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button
+                link
+                type="danger"
+                icon="Delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['disciplineType:disciplineType:remove']"
+              ></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改学生违纪处分类型对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="disciplineTypeFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="类型编码" prop="typeCode">
+          <el-input v-model="form.typeCode" placeholder="请输入类型编码" />
+        </el-form-item>
+        <el-form-item label="类型名称" prop="typeName">
+          <el-input v-model="form.typeName" placeholder="请输入类型名称" />
+        </el-form-item>
+        <el-form-item label="类型分类" prop="typeCategory">
+          <el-select v-model="form.typeCategory" placeholder="请选择类型分类">
+            <el-option v-for="dict in student_discipline_category" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="类型说明" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-radio-group v-model="form.status">
+            <el-radio v-for="dict in sys_msg_status" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="排序号" prop="sortOrder">
+          <el-input v-model="form.sortOrder" placeholder="请输入排序号" />
+        </el-form-item>
+        <!-- <el-form-item label="删除标志(0-未删除 1-已删除)" prop="deleted">
+          <el-input v-model="form.deleted" placeholder="请输入删除标志(0-未删除 1-已删除)" />
+        </el-form-item> -->
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="DisciplineType" lang="ts">
+import {
+  listDisciplineType,
+  getDisciplineType,
+  delDisciplineType,
+  addDisciplineType,
+  updateDisciplineType
+} from '@/api/xskh/disciplineType/disciplineType';
+import { DisciplineTypeVO, DisciplineTypeQuery, DisciplineTypeForm } from '@/api/xskh/disciplineType/disciplineType/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { student_discipline_category, sys_msg_status } = toRefs<any>(proxy?.useDict('student_discipline_category', 'sys_msg_status'));
+
+const disciplineTypeList = ref<DisciplineTypeVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const disciplineTypeFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: DisciplineTypeForm = {
+  id: undefined,
+  typeCode: undefined,
+  typeName: undefined,
+  typeCategory: undefined,
+  remark: undefined,
+  status: undefined,
+  sortOrder: undefined,
+  deleted: undefined
+};
+const data = reactive<PageData<DisciplineTypeForm, DisciplineTypeQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    typeCode: undefined,
+    typeName: undefined,
+    typeCategory: undefined,
+    status: undefined,
+    sortOrder: undefined,
+    deleted: undefined,
+    params: {}
+  },
+  rules: {
+    id: [{ required: true, message: '主键ID不能为空', trigger: 'blur' }],
+    typeCode: [{ required: true, message: '类型编码不能为空', trigger: 'blur' }],
+    typeName: [{ required: true, message: '类型名称不能为空', trigger: 'blur' }],
+    typeCategory: [{ required: true, message: '类型分类(1-违纪类型 2-处分类型)不能为空', trigger: 'change' }]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询学生违纪处分类型列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listDisciplineType(queryParams.value);
+  disciplineTypeList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  disciplineTypeFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: DisciplineTypeVO[]) => {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = '添加学生违纪处分类型';
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: DisciplineTypeVO) => {
+  reset();
+  const _id = row?.id || ids.value[0];
+  const res = await getDisciplineType(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = '修改学生违纪处分类型';
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  disciplineTypeFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateDisciplineType(form.value).finally(() => (buttonLoading.value = false));
+      } else {
+        await addDisciplineType(form.value).finally(() => (buttonLoading.value = false));
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      await getList();
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: DisciplineTypeVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除学生违纪处分类型编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
+  await delDisciplineType(_ids);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download(
+    'disciplineType/disciplineType/export',
+    {
+      ...queryParams.value
+    },
+    `disciplineType_${new Date().getTime()}.xlsx`
+  );
+};
+
+onMounted(() => {
+  getList();
+});
+</script>
+<style scoped>
+/* 页面容器样式 */
+.page-container {
+  padding: 8px;
+}
+
+/* 搜索按钮容器样式 */
+.search-btn-container {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 10px;
+
+  .el-form-item {
+    margin-bottom: 0 !important;
+  }
+}
+</style>
diff --git a/web/src/views/xskh/rewardType/index.vue b/web/src/views/xskh/rewardType/index.vue
new file mode 100644
index 00000000..01c01fff
--- /dev/null
+++ b/web/src/views/xskh/rewardType/index.vue
@@ -0,0 +1,272 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+            <el-form-item label="类型编码" prop="typeCode">
+              <el-input v-model="queryParams.typeCode" placeholder="请输入类型编码" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="类型名称" prop="typeName">
+              <el-input v-model="queryParams.typeName" placeholder="请输入类型名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="类型说明" prop="description" v-if="false">
+              <el-input v-model="queryParams.description" placeholder="请输入类型说明" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="状态" prop="status">
+              <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
+                <el-option v-for="dict in sys_msg_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="排序号" prop="sortOrder" v-if="false">
+              <el-input v-model="queryParams.sortOrder" placeholder="请输入排序号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="删除标志(0-未删除 1-已删除)" prop="deleted" v-if="false">
+              <el-input v-model="queryParams.deleted" placeholder="请输入删除标志(0-未删除 1-已删除)" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['rewardType:rewardType:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['rewardType:rewardType:edit']"
+              >修改</el-button
+            >
+          </el-col>
+          <!-- <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['rewardType:rewardType:remove']"
+              >删除</el-button
+            >
+          </el-col> -->
+          <!-- <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['rewardType:rewardType:export']">导出</el-button>
+          </el-col> -->
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" border :data="rewardTypeList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="主键ID" align="center" prop="id" v-if="true" />
+        <el-table-column label="类型编码" align="center" prop="typeCode" />
+        <el-table-column label="类型名称" align="center" prop="typeName" />
+        <el-table-column label="类型说明" align="center" prop="description" />
+        <el-table-column label="状态" align="center" prop="status">
+          <template #default="scope">
+            <dict-tag :options="sys_msg_status" :value="scope.row.status" />
+          </template>
+        </el-table-column>
+        <el-table-column label="排序号" align="center" prop="sortOrder" />
+        <!-- <el-table-column label="删除标志" align="center" prop="deleted" /> -->
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['rewardType:rewardType:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['rewardType:rewardType:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改学生奖励类型对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="rewardTypeFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="类型编码" prop="typeCode">
+          <el-input v-model="form.typeCode" placeholder="请输入类型编码" />
+        </el-form-item>
+        <el-form-item label="类型名称" prop="typeName">
+          <el-input v-model="form.typeName" placeholder="请输入类型名称" />
+        </el-form-item>
+        <el-form-item label="类型说明" prop="description">
+          <el-input v-model="form.description" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-select v-model="form.status" placeholder="请选择状态">
+            <el-option v-for="dict in sys_msg_status" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="排序号" prop="sortOrder">
+          <el-input v-model="form.sortOrder" placeholder="请输入排序号" />
+        </el-form-item>
+        <!-- <el-form-item label="删除标志(0-未删除 1-已删除)" prop="deleted">
+          <el-input v-model="form.deleted" placeholder="请输入删除标志(0-未删除 1-已删除)" />
+        </el-form-item> -->
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="RewardType" lang="ts">
+import { listRewardType, getRewardType, delRewardType, addRewardType, updateRewardType } from '@/api/xskh/rewardType/rewardType';
+import { RewardTypeVO, RewardTypeQuery, RewardTypeForm } from '@/api/xskh/rewardType/rewardType/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { sys_msg_status } = toRefs<any>(proxy?.useDict('sys_msg_status'));
+
+const rewardTypeList = ref<RewardTypeVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const rewardTypeFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: RewardTypeForm = {
+  id: undefined,
+  typeCode: undefined,
+  typeName: undefined,
+  description: undefined,
+  status: undefined,
+  sortOrder: undefined,
+  deleted: undefined
+};
+const data = reactive<PageData<RewardTypeForm, RewardTypeQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    typeCode: undefined,
+    typeName: undefined,
+    description: undefined,
+    status: undefined,
+    sortOrder: undefined,
+    deleted: undefined,
+    params: {}
+  },
+  rules: {
+    id: [{ required: true, message: '主键ID不能为空', trigger: 'blur' }],
+    typeCode: [{ required: true, message: '类型编码不能为空', trigger: 'blur' }],
+    typeName: [{ required: true, message: '类型名称不能为空', trigger: 'blur' }]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询学生奖励类型列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listRewardType(queryParams.value);
+  rewardTypeList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  rewardTypeFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: RewardTypeVO[]) => {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = '添加学生奖励类型';
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: RewardTypeVO) => {
+  reset();
+  const _id = row?.id || ids.value[0];
+  const res = await getRewardType(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = '修改学生奖励类型';
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  rewardTypeFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateRewardType(form.value).finally(() => (buttonLoading.value = false));
+      } else {
+        await addRewardType(form.value).finally(() => (buttonLoading.value = false));
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      await getList();
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: RewardTypeVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除学生奖励类型编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
+  await delRewardType(_ids);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download(
+    'rewardType/rewardType/export',
+    {
+      ...queryParams.value
+    },
+    `rewardType_${new Date().getTime()}.xlsx`
+  );
+};
+
+onMounted(() => {
+  getList();
+});
+</script>