1、调整干部接口判断问题

2、处分表字段调整

src/main/java/com/xjrsoft/module/student/controller/BaseStudentCadreController.java

@@ -8,10 +8,12 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.yulichang.toolkit.MPJWrappers;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.enums.StudentCadreLevelEnum;
+import com.xjrsoft.common.model.result.R;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
@@ -82,8 +84,54 @@ public class BaseStudentCadreController {
     @SaCheckPermission("basestudentcadre:detail")
     public RT<PageOutput<BaseStudentCadrePageVo>> mobliepage(@Valid BaseStudentCadrePageDto dto){
         // 如果未传班级id和职务id，
-        if((ObjectUtil.isEmpty(dto.getClassId()) && StrUtil.equals(dto.getLevel(), StudentCadreLevelEnum.CLASS.getCode()))|| ObjectUtil.isEmpty(dto.getPostId())){
-            return RT.ok(new PageOutput<>());
+        if(!StrUtil.equals(dto.getLevel(), StudentCadreLevelEnum.CLASS.getCode()) && ObjectUtil.isEmpty(dto.getPostId())){
+            IPage<BaseStudentCadrePageVo> page = new IPage<BaseStudentCadrePageVo>() {
+                @Override
+                public List<OrderItem> orders() {
+                    return null;
+                }
+
+                @Override
+                public List<BaseStudentCadrePageVo> getRecords() {
+                    return null;
+                }
+
+                @Override
+                public IPage<BaseStudentCadrePageVo> setRecords(List<BaseStudentCadrePageVo> records) {
+                    return null;
+                }
+
+                @Override
+                public long getTotal() {
+                    return 0;
+                }
+
+                @Override
+                public IPage<BaseStudentCadrePageVo> setTotal(long total) {
+                    return null;
+                }
+
+                @Override
+                public long getSize() {
+                    return 0;
+                }
+
+                @Override
+                public IPage<BaseStudentCadrePageVo> setSize(long size) {
+                    return null;
+                }
+
+                @Override
+                public long getCurrent() {
+                    return 0;
+                }
+
+                @Override
+                public IPage<BaseStudentCadrePageVo> setCurrent(long current) {
+                    return null;
+                }
+            };
+            return RT.ok(ConventPage.getPageOutput(page));
         }
 
         IPage<BaseStudentCadrePageVo> page = baseStudentCadreService.selectJoinListPage(ConventPage.getPage(dto), BaseStudentCadrePageVo.class,
@@ -93,6 +141,7 @@ public class BaseStudentCadreController {
                 .eq(ObjectUtil.isNotEmpty(dto.getPostId()), BaseStudentCadre::getPostId, dto.getPostId())
                 .eq(ObjectUtil.isNotEmpty(dto.getLevel()), BaseStudentPost::getLevel, dto.getLevel())
                 .eq(ObjectUtil.isNotEmpty(dto.getPost()), BaseStudentPost::getPost, dto.getPost())
+                .eq(StrUtil.equals(dto.getLevel(), StudentCadreLevelEnum.CLASS.getCode()), BaseClass::getTeacherId, StpUtil.getLoginIdAsLong())
                 .orderByDesc(BaseStudentCadre::getId)
                 .selectAs(BaseStudent::getStudentId, BaseStudentCadrePageVo::getStudentId)
                 .selectAs(XjrUser::getName, BaseStudentCadrePageVo::getUserName)
@@ -117,8 +166,55 @@ public class BaseStudentCadreController {
     @SaCheckPermission("basestudentcadre:detail")
     public RT<PageOutput<BaseStudentCadrePageVo>> page(@Valid BaseStudentCadrePageDto dto){
         // 如果未传班级id和职务id，
-        if((ObjectUtil.isEmpty(dto.getClassId()) && StrUtil.equals(dto.getLevel(), StudentCadreLevelEnum.CLASS.getCode()))|| ObjectUtil.isEmpty(dto.getPostId())){
-            return RT.ok(new PageOutput<>());
+        if(!StrUtil.equals(dto.getLevel(), StudentCadreLevelEnum.CLASS.getCode()) && ObjectUtil.isEmpty(dto.getPostId())){
+            IPage<BaseStudentCadrePageVo> page = new IPage<BaseStudentCadrePageVo>() {
+                @Override
+                public List<OrderItem> orders() {
+                    return null;
+                }
+
+                @Override
+                public List<BaseStudentCadrePageVo> getRecords() {
+                    return null;
+                }
+
+                @Override
+                public IPage<BaseStudentCadrePageVo> setRecords(List<BaseStudentCadrePageVo> records) {
+                    return null;
+                }
+
+                @Override
+                public long getTotal() {
+                    return 0;
+                }
+
+                @Override
+                public IPage<BaseStudentCadrePageVo> setTotal(long total) {
+                    return null;
+                }
+
+                @Override
+                public long getSize() {
+                    return 0;
+                }
+
+                @Override
+                public IPage<BaseStudentCadrePageVo> setSize(long size) {
+                    return null;
+                }
+
+                @Override
+                public long getCurrent() {
+                    return 0;
+                }
+
+                @Override
+                public IPage<BaseStudentCadrePageVo> setCurrent(long current) {
+                    return null;
+                }
+            };
+            page.setRecords(new ArrayList<>());
+            return RT.ok( ConventPage.getPageOutput(page, BaseStudentCadrePageVo.class));
         }
         IPage<BaseStudentCadrePageVo> page = baseStudentCadreService.selectJoinListPage(ConventPage.getPage(dto), BaseStudentCadrePageVo.class,
                 MPJWrappers.<BaseStudentCadre>lambdaJoin()
@@ -127,6 +223,7 @@ public class BaseStudentCadreController {
                 .eq(ObjectUtil.isNotEmpty(dto.getPostId()), BaseStudentCadre::getPostId, dto.getPostId())
                 .eq(ObjectUtil.isNotEmpty(dto.getLevel()), BaseStudentPost::getLevel, dto.getLevel())
                 .eq(ObjectUtil.isNotEmpty(dto.getPost()), BaseStudentPost::getPost, dto.getPost())
+                .eq(StrUtil.equals(dto.getLevel(), StudentCadreLevelEnum.CLASS.getCode()), BaseClass::getTeacherId, StpUtil.getLoginIdAsLong())
                 .orderByDesc(BaseStudentCadre::getId)
                 .selectAs(BaseStudent::getStudentId, BaseStudentCadrePageVo::getStudentId)
                 .selectAs(XjrUser::getName, BaseStudentCadrePageVo::getUserName)

src/main/resources/sqlScript/20231113_sql.sql

@@ -117,274 +117,13 @@ ALTER TABLE `tl`.`base_punishment_student_relation`
   ADD COLUMN `adjust_type` INT NULL   COMMENT '调整类型 1:升级 2:降级 3:撤销' AFTER `major`,
   ADD COLUMN `adjust_date` DATE NULL   COMMENT '调整日期' AFTER `adjust_type`,
   ADD COLUMN `adjust_reason` VARCHAR(500) NULL   COMMENT '调整原因' AFTER `adjust_date`;
-
-
---------------------------------------------------------------------学生考核--------------------------------------------------------------------
-
--- ----------------------------
--- 学生考核类别
--- ----------------------------
-DROP TABLE IF EXISTS base_student_assessment_category;
-CREATE TABLE base_student_assessment_category
-(
-    id BIGINT NOT NULL COMMENT '主键编号',
-    `create_user_id` BIGINT NULL DEFAULT NULL COMMENT '创建人',
-    `create_date` DATE NULL DEFAULT NULL COMMENT '创建时间',
-    `modify_user_id` BIGINT NULL DEFAULT NULL COMMENT '修改人',
-    `modify_date` DATE NULL DEFAULT NULL COMMENT '修改时间',
-    `delete_mark` INT NOT NULL COMMENT '删除标记',
-    `enabled_mark` INT NOT NULL COMMENT '有效标志',
-    `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
-    `name` VARCHAR(200) NOT NULL COMMENT '名称',
-    `code` VARCHAR(100) NULL DEFAULT NULL COMMENT '编码',
-    `total_score` double NOT NULL DEFAULT 0 COMMENT '总分',
-    `remark` VARCHAR(1000) COMMENT '备注',
-    PRIMARY KEY (`id`)
-) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生考核类别';
-
-
--- ----------------------------
--- 学生考核项目
--- ----------------------------
-DROP TABLE IF EXISTS base_student_assessment_project;
-CREATE TABLE base_student_assessment_project
-(
-    id BIGINT NOT NULL COMMENT '主键编号',
-    `create_user_id` BIGINT NULL DEFAULT NULL COMMENT '创建人',
-    `create_date` DATE NULL DEFAULT NULL COMMENT '创建时间',
-    `modify_user_id` BIGINT NULL DEFAULT NULL COMMENT '修改人',
-    `modify_date` DATE NULL DEFAULT NULL COMMENT '修改时间',
-    `delete_mark` INT NOT NULL COMMENT '删除标记',
-    `enabled_mark` INT NOT NULL COMMENT '有效标志',
-    `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
-    `base_student_assessment_category_id` bigint NOT NULL COMMENT '学生考核类别(base_student_assessment_category)',
-    `name` VARCHAR(200) NOT NULL COMMENT '名称',
-    `code` VARCHAR(100) NULL DEFAULT NULL COMMENT '编码',
-    `basic_points` double NOT NULL DEFAULT 0 COMMENT '基础分',
-    `points_deducted_min` double NOT NULL DEFAULT 0 COMMENT '扣分范围（最小）',
-    `points_deducted_max` double NOT NULL DEFAULT 0 COMMENT '扣分范围（最大）',
-    `add_points_min` double NOT NULL DEFAULT 0 COMMENT '加分范围（最小）',
-    `add_points_max` double NOT NULL DEFAULT 0 COMMENT '加分范围（最大）',
-    `department_id` bigint NOT NULL COMMENT '所属机构(xjr_department)',
-    `status` INT NULL DEFAULT 1 COMMENT '是否启用(1:是 0:否)',
-    `is_affect` INT NULL DEFAULT 0 COMMENT '是否影响(1:是 0:否)',
-    `processing_method` varchar(20) NULL DEFAULT NULL COMMENT '学生操行分处理方式(xjr_dictionary_item[ap_method])',
-    `behavior_score` double NOT NULL DEFAULT 0 COMMENT '折算操行分要求',
-    `base_student_behavior_project_id` bigint NOT NULL DEFAULT 0 COMMENT '操行项目编号',
-    `is_teacher_edit` INT NULL DEFAULT 0 COMMENT '是否允许班主任修改项目(1:是 0:否)',
-    `behavior_score_remark` VARCHAR(1000) NULL DEFAULT NULL COMMENT '手动处理学生操行分说明',
-    `remark` VARCHAR(1000) COMMENT '备注',
-    PRIMARY KEY (`id`)
-) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生考核项目';
-
--- ----------------------------
--- 学生考核基础分设置
--- ----------------------------
-DROP TABLE IF EXISTS base_student_assessment_base_score;
-CREATE TABLE base_student_assessment_base_score
-(
-    id BIGINT NOT NULL COMMENT '主键编号',
-    `create_user_id` BIGINT NULL DEFAULT NULL COMMENT '创建人',
-    `create_date` DATE NULL DEFAULT NULL COMMENT '创建时间',
-    `modify_user_id` BIGINT NULL DEFAULT NULL COMMENT '修改人',
-    `modify_date` DATE NULL DEFAULT NULL COMMENT '修改时间',
-    `delete_mark` INT NOT NULL COMMENT '删除标记',
-    `enabled_mark` INT NOT NULL COMMENT '有效标志',
-    `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
-    `base_semester_id` bigint COMMENT '学期ID(base_semester)',
-    `assessment_cycle` varchar(20) NULL DEFAULT NULL COMMENT '考核周期方式(xjr_dictionary_item[assessment_cycle])',
-    `base_score` double NOT NULL DEFAULT 0 COMMENT '基础分',
-    PRIMARY KEY (`id`)
-) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生考核基础分设置';
-
-
--- ----------------------------
--- 学生考核等级设置
--- ----------------------------
-DROP TABLE IF EXISTS base_student_assessment_base_level;
-CREATE TABLE base_student_assessment_base_level
-(
-    id BIGINT NOT NULL COMMENT '主键编号',
-    `create_user_id` BIGINT NULL DEFAULT NULL COMMENT '创建人',
-    `create_date` DATE NULL DEFAULT NULL COMMENT '创建时间',
-    `modify_user_id` BIGINT NULL DEFAULT NULL COMMENT '修改人',
-    `modify_date` DATE NULL DEFAULT NULL COMMENT '修改时间',
-    `delete_mark` INT NOT NULL COMMENT '删除标记',
-    `enabled_mark` INT NOT NULL COMMENT '有效标志',
-    `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
-    `name` VARCHAR(200) NOT NULL COMMENT '名称',
-    `score_min` double NOT NULL DEFAULT 0 COMMENT '分数范围（最小）',
-    `score_max` double NOT NULL DEFAULT 0 COMMENT '分数范围（最大）',
-    PRIMARY KEY (`id`)
-) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生考核等级设置';
-
--- ----------------------------
--- 学生班级巡查考核
--- ----------------------------
-DROP TABLE IF EXISTS base_student_assessment_inspection;
-CREATE TABLE base_student_assessment_inspection
-(
-    id BIGINT NOT NULL COMMENT '主键编号',
-    `create_user_id` BIGINT NULL DEFAULT NULL COMMENT '创建人',
-    `create_date` DATE NULL DEFAULT NULL COMMENT '创建时间',
-    `modify_user_id` BIGINT NULL DEFAULT NULL COMMENT '修改人',
-    `modify_date` DATE NULL DEFAULT NULL COMMENT '修改时间',
-    `delete_mark` INT NOT NULL COMMENT '删除标记',
-    `enabled_mark` INT NOT NULL COMMENT '有效标志',
-    `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
-    `base_semester_id` bigint COMMENT '学期ID(base_semester)',
-    `grade_id` bigint NOT NULL COMMENT '入学年级(base_grade)',
-    `class_ids` varchar(10000) NOT NULL COMMENT '班级Ids(多选)',
-    `assessment_date` date NULL DEFAULT NULL COMMENT '考核时间',
-    `score` double NOT NULL DEFAULT 0 COMMENT '分数',
-    `score_type` varchar(20) NULL DEFAULT NULL COMMENT '分数类型(xjr_dictionary_item[score_type])',
-    `assessment_user_id` bigint not null COMMENT '考核用户ID(xjr_user)',
-    `reason` VARCHAR(1000) COMMENT '原因',
-    `file_id` bigint NULL DEFAULT NULL COMMENT '文件ID(xjr_file)',
-    `status` INT NOT NULL COMMENT '状态（1:结束 0:未结束）',
-    PRIMARY KEY (`id`)
-) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生班级巡查考核';
-
-
--- ----------------------------
--- 学生班级巡查考核-关联学生
--- ----------------------------
-DROP TABLE IF EXISTS base_student_assessment_student_relation;
-CREATE TABLE base_student_assessment_student_relation
-(
-    id BIGINT NOT NULL COMMENT '主键编号',
-    `user_id`  BIGINT NULL DEFAULT NULL COMMENT'学生id',
-    `base_student_assessment_inspection_id` BIGINT NULL DEFAULT NULL COMMENT '学生班级巡查考核id',
-    `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
-    `student_id` VARCHAR(30) NULL DEFAULT NULL COMMENT '学号',
-    `name` VARCHAR(30) NULL DEFAULT NULL COMMENT '姓名',
-    `gender` VARCHAR(30) NULL DEFAULT 1 COMMENT '性别',
-    `nation` VARCHAR(30) NULL DEFAULT NULL COMMENT '民族(xjr_dictionary_item[nation])',
-    `class` VARCHAR(50) NULL DEFAULT NULL COMMENT '所在班级',
-    `major` VARCHAR(50) NULL DEFAULT NULL COMMENT '所学专业',
-    PRIMARY KEY (`id`)
-) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生班级巡查考核-关联学生';
-
-
--- ----------------------------
--- 学生班级巡查考核-关联班级（流程结束写入数据）
--- ----------------------------
-DROP TABLE IF EXISTS base_student_assessment_class_relation;
-CREATE TABLE base_student_assessment_class_relation
-(
-    id BIGINT NOT NULL COMMENT '主键编号',
-    `class_id`  BIGINT NULL DEFAULT NULL COMMENT'班级编号id',
-    `base_student_assessment_inspection_id` BIGINT NULL DEFAULT NULL COMMENT '学生班级巡查考核id',
-    `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
-    `teacher_name` VARCHAR(30) NULL DEFAULT NULL COMMENT '班主任姓名',
-    PRIMARY KEY (`id`)
-) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生班级巡查考核-关联班级';
-
---------------------------------------------------------------------学生考核--------------------------------------------------------------------
-
---------------------------------------------------------------------学生操行--------------------------------------------------------------------
-
--- ----------------------------
--- 学生操行基础分设置
--- ----------------------------
-DROP TABLE IF EXISTS base_student_behavior_base_score;
-CREATE TABLE base_student_behavior_base_score
-(
-    id BIGINT NOT NULL COMMENT '主键编号',
-    `create_user_id` BIGINT NULL DEFAULT NULL COMMENT '创建人',
-    `create_date` DATE NULL DEFAULT NULL COMMENT '创建时间',
-    `modify_user_id` BIGINT NULL DEFAULT NULL COMMENT '修改人',
-    `modify_date` DATE NULL DEFAULT NULL COMMENT '修改时间',
-    `delete_mark` INT NOT NULL COMMENT '删除标记',
-    `enabled_mark` INT NOT NULL COMMENT '有效标志',
-    `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
-    `base_semester_id` bigint COMMENT '学期ID(base_semester)',
-    `assessment_cycle` varchar(20) NULL DEFAULT NULL COMMENT '考核周期方式(xjr_dictionary_item[assessment_cycle])',
-    `base_score` double NOT NULL DEFAULT 0 COMMENT '基础分',
-    `passing_score` double NOT NULL DEFAULT 0 COMMENT '及格分',
-    PRIMARY KEY (`id`)
-) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生操行基础分设置';
-
--- ----------------------------
--- 学生操行等级设置
--- ----------------------------
-DROP TABLE IF EXISTS base_student_behavior_base_level;
-CREATE TABLE base_student_behavior_base_level
-(
-    id BIGINT NOT NULL COMMENT '主键编号',
-    `create_user_id` BIGINT NULL DEFAULT NULL COMMENT '创建人',
-    `create_date` DATE NULL DEFAULT NULL COMMENT '创建时间',
-    `modify_user_id` BIGINT NULL DEFAULT NULL COMMENT '修改人',
-    `modify_date` DATE NULL DEFAULT NULL COMMENT '修改时间',
-    `delete_mark` INT NOT NULL COMMENT '删除标记',
-    `enabled_mark` INT NOT NULL COMMENT '有效标志',
-    `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
-    `name` VARCHAR(200) NOT NULL COMMENT '名称',
-    `score_min` double NOT NULL DEFAULT 0 COMMENT '分数范围（最小）',
-    `score_max` double NOT NULL DEFAULT 0 COMMENT '分数范围（最大）',
-    PRIMARY KEY (`id`)
-) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生操行等级设置';
-
--- ----------------------------
--- 学生操行分考核类别
--- ----------------------------
-DROP TABLE IF EXISTS base_student_behavior_category;
-CREATE TABLE base_student_behavior_category
-(
-    id BIGINT NOT NULL COMMENT '主键编号',
-    `create_user_id` BIGINT NULL DEFAULT NULL COMMENT '创建人',
-    `create_date` DATE NULL DEFAULT NULL COMMENT '创建时间',
-    `modify_user_id` BIGINT NULL DEFAULT NULL COMMENT '修改人',
-    `modify_date` DATE NULL DEFAULT NULL COMMENT '修改时间',
-    `delete_mark` INT NOT NULL COMMENT '删除标记',
-    `enabled_mark` INT NOT NULL COMMENT '有效标志',
-    `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
-    `name` VARCHAR(200) NOT NULL COMMENT '名称',
-    `code` VARCHAR(100) NULL DEFAULT NULL COMMENT '编码',
-    `status` INT NULL DEFAULT 1 COMMENT '是否启用(1:是 0:否)',
-    `remark` VARCHAR(1000) COMMENT '备注'
-    PRIMARY KEY (`id`)
-) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生考核类别';
-
--- ----------------------------
--- 学生操行分考核项目
--- ----------------------------
-DROP TABLE IF EXISTS base_student_behavior_project;
-CREATE TABLE base_student_behavior_project
-(
-    id BIGINT NOT NULL COMMENT '主键编号',
-    `create_user_id` BIGINT NULL DEFAULT NULL COMMENT '创建人',
-    `create_date` DATE NULL DEFAULT NULL COMMENT '创建时间',
-    `modify_user_id` BIGINT NULL DEFAULT NULL COMMENT '修改人',
-    `modify_date` DATE NULL DEFAULT NULL COMMENT '修改时间',
-    `delete_mark` INT NOT NULL COMMENT '删除标记',
-    `enabled_mark` INT NOT NULL COMMENT '有效标志',
-    `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
-    `base_student_behavior_category_id` BIGINT NULL DEFAULT NULL COMMENT '学生考核类别编号(base_student_behavior_category)',
-    `name` VARCHAR(200) NOT NULL COMMENT '名称',
-    `code` VARCHAR(100) NULL DEFAULT NULL COMMENT '编码',
-    `score_type` varchar(20) NULL DEFAULT NULL COMMENT '考核类型(xjr_dictionary_item[score_type])',
-    `score` double NOT NULL DEFAULT 0 COMMENT '分值',
-    `is_adjustment` INT NULL DEFAULT 0 COMMENT '是否允许调整(1:是 0:否)',
-    `points_deducted_min` double NOT NULL DEFAULT 0 COMMENT '扣分范围（最小）',
-    `points_deducted_max` double NOT NULL DEFAULT 0 COMMENT '扣分范围（最大）',
-    `is_impact_assessment` INT NULL DEFAULT 0 COMMENT '是否影响班级考核(1:是 0:否)',
-    `conversion_method` INT NULL DEFAULT 1 COMMENT '换算方式(1:手动换算 2:自动换算)',
-    `status` INT NULL DEFAULT 1 COMMENT '是否启用(1:是 0:否)',
-    `base_student_assessment_project_id` BIGINT NULL DEFAULT NULL COMMENT '班级考核项目编号（base_student_assessment_project）',
-    `is_edit` INT NULL DEFAULT 0 COMMENT '是否允许修改(1:是 0:否)',
-    `automatic_score_type` varchar(20) NULL DEFAULT NULL COMMENT '自动换算考核类型(xjr_dictionary_item[score_type])',
-    `remark` VARCHAR(1000) COMMENT '备注'
-    PRIMARY KEY (`id`)
-) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生操行分考核项目';
-
-
---------------------------------------------------------------------学生操行--------------------------------------------------------------------
-
-
-
-
-
-
-
+  
+ALTER TABLE `tl`.`base_punishment_student_relation`   
+  CHANGE `class` `className` VARCHAR(50) CHARSET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL   COMMENT '所在班级';
+  
+ALTER TABLE `tl`.`base_punishment_student_relation`   
+  ADD COLUMN `modify_user_id` INT NULL   COMMENT '修改人' AFTER `adjust_date`,
+  ADD COLUMN `modify_date` DATE NULL   COMMENT '修改时间' AFTER `modify_user_id`;
+ALTER TABLE `tl`.`base_student_punishment_info`   
+  CHANGE `class_id` `class_id` BIGINT NULL   COMMENT '班级id';