src/main/java/com/xjrsoft/module/form/service/impl/FormExecuteServiceImpl.java

@@ -656,6 +656,7 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
                             Entity childDeleteWhere = Entity.create(tableConfig.getTableName()).
                                     set(childTableConfig.get().getRelationField(), keyValues);
                             Boolean result = SqlRunnerAdapter.db().dynamicDelete(childTableConfig.get().getTableName(), childDeleteWhere);
+                            // TODO 当子表没有添加数据的时候，删除结果为false。
                             if (!result) {
                                 throw new MyException("删除数据失败");
                             }

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

@@ -23,19 +23,26 @@ import com.xjrsoft.common.utils.TreeUtil;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.base.entity.BaseClass;
 import com.xjrsoft.module.base.entity.BaseGrade;
+import com.xjrsoft.module.base.entity.BaseMajorSet;
 import com.xjrsoft.module.base.service.IBaseClassService;
 import com.xjrsoft.module.base.service.IBaseGradeService;
 import com.xjrsoft.module.concat.service.IXjrUserService;
 import com.xjrsoft.module.hikvision.util.DataUtil;
+import com.xjrsoft.module.organization.entity.Department;
 import com.xjrsoft.module.organization.entity.UserDeptRelation;
+import com.xjrsoft.module.organization.service.IDepartmentService;
 import com.xjrsoft.module.organization.service.IUserDeptRelationService;
 import com.xjrsoft.module.room.service.IRoomBedService;
 import com.xjrsoft.module.student.dto.AddBaseStudentUserDto;
 import com.xjrsoft.module.student.dto.BaseStudentUserPageDto;
 import com.xjrsoft.module.student.dto.UpdateBaseStudentUserDto;
+import com.xjrsoft.module.student.entity.BaseClassMajorSet;
+import com.xjrsoft.module.student.entity.BaseMajor;
 import com.xjrsoft.module.student.entity.BaseStudent;
 import com.xjrsoft.module.student.entity.BaseStudentUser;
+import com.xjrsoft.module.student.service.IBaseMajorService;
 import com.xjrsoft.module.student.service.IStudentManagerService;
+import com.xjrsoft.module.student.vo.BaseClassMajorSetVo;
 import com.xjrsoft.module.student.vo.BaseDepMajorGradeClassStudenTreeVo;
 import com.xjrsoft.module.student.vo.BaseStudentSchoolRollVo;
 import com.xjrsoft.module.student.vo.BaseStudentTreeVo;
@@ -205,8 +212,7 @@ public class StudentManagerController {
     @ApiOperation(value = "学生部门专业年级班级树")
     @SaCheckPermission("studentmanager:detail")
     public RT<List<BaseDepMajorGradeClassStudenTreeVo>> tree2() {
-        List<BaseDepMajorGradeClassStudenTreeVo> treeVoList = studentManagerService.deptMajorGradeClassTree();
-        return RT.ok(treeVoList);
+        return RT.ok(studentManagerService.tree2());
     }
 
 

src/main/java/com/xjrsoft/module/student/service/IStudentManagerService.java

@@ -65,5 +65,5 @@ public interface IStudentManagerService extends MPJBaseService<BaseStudentUser>
 
     Boolean uploadImage(Long userId, MultipartFile file) throws IOException;
 
-    List<BaseDepMajorGradeClassStudenTreeVo> deptMajorGradeClassTree();
+    List<BaseDepMajorGradeClassStudenTreeVo> tree2();
 }

src/main/java/com/xjrsoft/module/student/service/impl/StudentManagerServiceImpl.java

@@ -42,32 +42,13 @@ import com.xjrsoft.module.organization.service.IUserService;
 import com.xjrsoft.module.student.dto.AddBaseStudentUserDto;
 import com.xjrsoft.module.student.dto.BaseStudentUserPageDto;
 import com.xjrsoft.module.student.dto.UpdateBaseStudentUserDto;
-import com.xjrsoft.module.student.entity.BaseClassMajorSet;
-import com.xjrsoft.module.student.entity.BaseMajor;
-import com.xjrsoft.module.student.entity.BaseStudent;
-import com.xjrsoft.module.student.entity.BaseStudentContact;
-import com.xjrsoft.module.student.entity.BaseStudentFamily;
-import com.xjrsoft.module.student.entity.BaseStudentFamilyMember;
-import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
-import com.xjrsoft.module.student.entity.BaseStudentSubsidize;
-import com.xjrsoft.module.student.entity.BaseStudentUser;
+import com.xjrsoft.module.student.entity.*;
 import com.xjrsoft.module.student.mapper.BaseStudentFamilyMapper;
 import com.xjrsoft.module.student.mapper.BaseStudentFamilyMemberMapper;
 import com.xjrsoft.module.student.mapper.BaseStudentMapper;
 import com.xjrsoft.module.student.mapper.BaseStudentUserMapper;
-import com.xjrsoft.module.student.service.IBaseMajorService;
-import com.xjrsoft.module.student.service.IBaseStudentContactService;
-import com.xjrsoft.module.student.service.IBaseStudentFamilyService;
-import com.xjrsoft.module.student.service.IBaseStudentSchoolRollService;
-import com.xjrsoft.module.student.service.IBaseStudentService;
-import com.xjrsoft.module.student.service.IBaseStudentSubsidizeService;
-import com.xjrsoft.module.student.service.IStudentManagerService;
-import com.xjrsoft.module.student.vo.BaseClassMajorSetVo;
-import com.xjrsoft.module.student.vo.BaseDepMajorGradeClassStudenTreeVo;
-import com.xjrsoft.module.student.vo.BaseStudentClassVo;
-import com.xjrsoft.module.student.vo.BaseStudentUserPageVo;
-import com.xjrsoft.module.student.vo.PersonalPortraitPersonalInfoVo;
-import com.xjrsoft.module.student.vo.StudentPersonalInfoVo;
+import com.xjrsoft.module.student.service.*;
+import com.xjrsoft.module.student.vo.*;
 import com.xjrsoft.module.system.entity.Area;
 import com.xjrsoft.module.system.entity.DictionaryDetail;
 import com.xjrsoft.module.system.entity.DictionaryItem;
@@ -128,11 +109,14 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
     private final IUserService userService;
     private final CommonPropertiesConfig propertiesConfig;
 
-    private final IBaseGradeService baseGradeService;
     private final IDepartmentService baseDeparmentService;
     private final IBaseMajorService baseMajorService;
+
+
     private final IBaseClassService baseClassService;
 
+    private final IBaseGradeService baseGradeService;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long add(AddBaseStudentUserDto dto){
@@ -1006,7 +990,7 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
     }
 
     @Override
-    public List<BaseDepMajorGradeClassStudenTreeVo> deptMajorGradeClassTree() {
+    public List<BaseDepMajorGradeClassStudenTreeVo> tree2() {
         List<BaseDepMajorGradeClassStudenTreeVo> voList = new ArrayList<>();
         MPJLambdaWrapper<BaseClass> baseClassMPJLambdaWrapper = new MPJLambdaWrapper<>();
         baseClassMPJLambdaWrapper
@@ -1064,8 +1048,7 @@ public class StudentManagerServiceImpl extends MPJBaseServiceImpl<BaseStudentUse
             }});
         });
 
-        List<BaseDepMajorGradeClassStudenTreeVo> treeVoList = TreeUtil.build(voList);
-        return treeVoList;
+        return TreeUtil.build(voList);
     }
 
     /**

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

@@ -93,13 +93,13 @@ CREATE TABLE student_cert_table
     class_name         varchar(64)  not null comment '学生班级',
     teacher_id         bigint       NOT NULL COMMENT '教师id',
     teacher_name       varchar(64)  NOT NULL COMMENT '教师姓名',
-    cert_name          varchar(255) NOT NULL COMMENT '证书名称',
-    cert_id            varchar(128) NOT NULL COMMENT '证书编号',
-    cert_grade         varchar(64)  NOT NULL COMMENT '证书等级',
+    cert_name          varchar(512) NOT NULL COMMENT '证书名称',
+    cert_id            varchar(256) NOT NULL COMMENT '证书编号',
+    cert_grade         varchar(64)  NULL COMMENT '证书等级',
     cert_organizations varchar(255) NOT NULL COMMENT '证书发放机构',
-    cert_date          date         NOT NULL COMMENT '证书发放日期',
+    cert_date          date         NULL COMMENT '证书发放日期',
     cert_electronic    varchar(64)  NOT NULL COMMENT '是否支持电子证书(0：否，1：是)',
-    remark             varchar(255) DEFAULT NULL COMMENT '备注',
+    remark             varchar(1024) DEFAULT NULL COMMENT '备注',
     file_id            longtext     NOT NULL COMMENT '附件',
     status             int          NOT NULL COMMENT '状态（1:结束 0:未结束）'
 ) ENGINE = InnoDB

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

@@ -39,8 +39,8 @@ CREATE TABLE `training_protuct`
     `training_number`           varchar(32)  NOT NULL COMMENT '实训室号',
     `department_id`             bigint       NOT NULL COMMENT '所属机构(xjr_department)',
     `department_name`           varchar(255) NOT NULL COMMENT '所属机构',
-    `school_training_base_id`   bigint       NOT NULL COMMENT '所属实训基地id(school_training_base)',
-    `school_training_base_name` varchar(255) NOT NULL COMMENT '所属实训基地',
+    `school_training_base_id`   bigint       NULL COMMENT '所属实训基地id(school_training_base)',
+    `school_training_base_name` varchar(255) NULL COMMENT '所属实训基地',
     `training_createdate`       date         NOT NULL COMMENT '实验室建立日期',
     `contact_id`                bigint       NOT NULL COMMENT '负责人(xjr_user)',
     `contact_name`              varchar(255) NOT NULL COMMENT '负责人',
@@ -73,18 +73,19 @@ create table training_project_safe
     dummy_pro              varchar(25)  not null comment '是否虚拟仿真实训项目',
     skill_request          varchar(255) NULL comment '技能要求',
     assorted_resource_name varchar(512) NULL comment '配套实训资源名称',
-    model_count            int NULL comment '模块数量',
+    model_count            int          NULL comment '模块数量',
     assess_manner          varchar(255) NULL comment '考核方式',
     out_service            varchar(25)  not null comment '是否对外服务',
-    student_class_count    double NULL comment '学生实训课时数',
+    student_class_count    double       NULL comment '学生实训课时数',
     study_year             varchar(255) not null comment '学年（度）',
-    base_semester_id       bigint not null comment '学期id(base_semester)',
+    base_semester_id       bigint       not null comment '学期id(base_semester)',
     base_semester_name     varchar(255) not null comment '学期名称',
     training_address       varchar(255) NULL comment '实训地点',
-    training_protuct_id    bigint NULL comment '校内实训室id',
+    training_protuct_id    bigint       NULL comment '校内实训室id',
     training_protuct_name  varchar(255) NULL comment '校内实训室'
 ) comment '实训项目维护';
 
+-- 实训教学过程
 DROP TABLE IF EXISTS `practical_tt_records`;
 CREATE TABLE `practical_tt_records`
 (

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

@@ -12,6 +12,7 @@ CREATE TABLE party_member_manage
     sort_code         int          null comment '序号',
     party_member_name VARCHAR(36)  not null comment '党员姓名',
     party_member_id   bigint       not null comment '党员编号',
+    party_member_oa   VARCHAR(64)  not null comment '党员oa',
     party_tissue_name VARCHAR(256) not null comment '所属党组织名称',
     party_tissue_code bigint       not null comment '所属党组织编号',
     party_tissue_type varchar(256) not null comment '党组织类型',

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

@@ -2,55 +2,55 @@
 DROP TABLE IF EXISTS `party_cadre_study`;
 CREATE TABLE `party_cadre_study`
 (
-    id                        BIGINT       NOT NULL COMMENT '主键编号'
-        PRIMARY KEY,
-    create_user_id            BIGINT       NULL COMMENT '创建人',
-    create_date               DATETIME     NULL COMMENT '创建时间',
-    modify_user_id            BIGINT       NULL COMMENT '修改人',
-    modify_date               DATETIME     NULL COMMENT '修改时间',
-    delete_mark               INT          NOT NULL COMMENT '删除标记',
-    enabled_mark              INT          NOT NULL COMMENT '有效标志',
-    sort_code                 INT          NULL COMMENT '序号',
-
-    party_tissue_id           BIGINT       NOT NULL COMMENT '党组织主键id(party_tissue_manager)',
-    party_tissue_name         VARCHAR(256) NOT NULL COMMENT '党组织名称',
-    party_tissue_code         VARCHAR(256) NOT NULL COMMENT '党组织编号',
-
-    party_train_way_carrier   VARCHAR(500) NOT NULL COMMENT '党员干部学习培训主要途径和载体',
-    party_train_way_content   VARCHAR(500) NOT NULL COMMENT '党员干部学习培训内容',
-
-    start_time                DATE         NOT NULL COMMENT '活动开始日期',
-    end_time                  DATE         NOT NULL COMMENT '活动结束日期',
-
-    participate_teacher_count INT          NULL COMMENT '参与教师数',
-    participate_student_count INT          NULL COMMENT '参与学生数'
-) ENGINE = INNODB
+    id                        bigint       not null comment '主键编号'
+        primary key,
+    create_user_id            bigint       null comment '创建人',
+    create_date               datetime     null comment '创建时间',
+    modify_user_id            bigint       null comment '修改人',
+    modify_date               datetime     null comment '修改时间',
+    delete_mark               int          not null comment '删除标记',
+    enabled_mark              int          not null comment '有效标志',
+    sort_code                 int          null comment '序号',
+
+    party_tissue_id           bigint       not null comment '党组织主键id(party_tissue_manager)',
+    party_tissue_name         varchar(256) not null comment '党组织名称',
+    party_tissue_code         varchar(256) not null comment '党组织编号',
+
+    party_train_way_carrier   varchar(500) not null comment '党员干部学习培训主要途径和载体',
+    party_train_way_content   varchar(500) not null comment '党员干部学习培训内容',
+
+    start_time                date         not null comment '活动开始日期',
+    end_time                  date         not null comment '活动结束日期',
+
+    participate_teacher_count int          null comment '参与教师数',
+    participate_student_count int          null comment '参与学生数'
+) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
-    COMMENT '党员干部学习';
+    comment '党员干部学习';
 
 -- 党员干部学习活动参与人
 DROP TABLE IF EXISTS `party_cadre_study_participant`;
 CREATE TABLE `party_cadre_study_participant`
 (
-    id                   BIGINT       NOT NULL COMMENT '主键编号'
-        PRIMARY KEY,
-    create_user_id       BIGINT       NULL COMMENT '创建人',
-    create_date          DATETIME     NULL COMMENT '创建时间',
-    modify_user_id       BIGINT       NULL COMMENT '修改人',
-    modify_date          DATETIME     NULL COMMENT '修改时间',
-    delete_mark          INT          NOT NULL COMMENT '删除标记',
-    enabled_mark         INT          NOT NULL COMMENT '有效标志',
-    sort_code            INT          NULL COMMENT '序号',
-
-    party_cadre_study_id BIGINT       NULL COMMENT '党员干部学习主键id（party_cadre_study）',
-    participant_id       BIGINT       NULL COMMENT '活动参与人id',
-    participant_remark   VARCHAR(256) NULL COMMENT '活动参与人类型',
-    participant_username VARCHAR(256) NULL COMMENT '活动参与人oa',
-    participant_user_id  VARCHAR(256) NULL COMMENT '活动参与人学号，工号',
-    participant_name     VARCHAR(256) NULL COMMENT '活动参与人姓名'
-) ENGINE = INNODB
+    id                   bigint       not null comment '主键编号'
+        primary key,
+    create_user_id       bigint       null comment '创建人',
+    create_date          datetime     null comment '创建时间',
+    modify_user_id       bigint       null comment '修改人',
+    modify_date          datetime     null comment '修改时间',
+    delete_mark          int          not null comment '删除标记',
+    enabled_mark         int          not null comment '有效标志',
+    sort_code            int          null comment '序号',
+
+    party_cadre_study_id bigint       null comment '党员干部学习主键id（party_cadre_study）',
+    participant_id       bigint       null comment '活动参与人id',
+    participant_remark   varchar(256) null comment '活动参与人类型',
+    participant_username varchar(256) null comment '活动参与人oa',
+    participant_user_id  varchar(256) null comment '活动参与人学号，工号',
+    participant_name     varchar(256) null comment '活动参与人姓名'
+) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
-    COMMENT '党员干部学习活动参与人';
+    comment '党员干部学习活动参与人';
 
 # 数据字典
 # par_part 党员干部学习培训内容
@@ -81,60 +81,60 @@ CREATE TABLE `party_cadre_study_participant`
 # 10 在线教育网站           party_way10
 # 11 参观学习             party_way11
 # 99 其他                   party_way99
-
+-- 党课管理数据表
 DROP TABLE IF EXISTS party_class_manage;
 CREATE TABLE party_class_manage
 (
-    id                        BIGINT       NOT NULL COMMENT '主键编号' PRIMARY KEY,
-    create_user_id            BIGINT       NULL COMMENT '创建人',
-    create_date               DATETIME     NULL COMMENT '创建时间',
-    modify_user_id            BIGINT       NULL COMMENT '修改人',
-    modify_date               DATETIME     NULL COMMENT '修改时间',
-    delete_mark               INT          NOT NULL COMMENT '删除标记',
-    enabled_mark              INT          NOT NULL COMMENT '有效标志',
-    sort_code                 INT          NULL COMMENT '序号',
+    id                        bigint       not null comment '主键编号' primary key,
+    create_user_id            bigint       null comment '创建人',
+    create_date               datetime     null comment '创建时间',
+    modify_user_id            bigint       null comment '修改人',
+    modify_date               datetime     null comment '修改时间',
+    delete_mark               int          not null comment '删除标记',
+    enabled_mark              int          not null comment '有效标志',
+    sort_code                 int          null comment '序号',
 
-    party_tissue_name         VARCHAR(256) NOT NULL COMMENT '党组织名称',
-    party_tissue_code         VARCHAR(256) NOT NULL COMMENT '党组织编号',
-    party_tissue_id           BIGINT       NOT NULL COMMENT '党组织主键id(party_tissue_manager)',
+    party_tissue_name         varchar(256) not null comment '党组织名称',
+    party_tissue_code         varchar(256) not null comment '党组织编号',
+    party_tissue_id           bigint       not null comment '党组织主键id(party_tissue_manager)',
 
-    activity_type             VARCHAR(256) NOT NULL COMMENT '活动形式',
-    speaker_name              VARCHAR(256) NULL COMMENT '党课主讲人',
+    activity_type             varchar(256) null comment '活动形式',
+    speaker_name              varchar(256) null comment '党课主讲人',
 
-    start_time                DATE         NOT NULL COMMENT '活动开始时间',
-    end_time                  DATE         NOT NULL COMMENT '活动结束时间',
+    start_time                date         not null comment '活动开始时间',
+    end_time                  date         not null comment '活动结束时间',
 
-    activities_content        TEXT         NULL COMMENT '活动内容',
+    activities_content        text         NULL COMMENT '活动内容',
 
-    participate_teacher_count INT          NULL COMMENT '参与教师数',
-    participate_student_count INT          NULL COMMENT '参与学生数'
+    participate_teacher_count int          null comment '参与教师数',
+    participate_student_count int          null comment '参与学生数'
 
-) ENGINE = INNODB
+) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
     COMMENT ='党课管理数据表';
 
-
+-- 党课活动参与人表
 DROP TABLE IF EXISTS party_class_manage_participant;
 CREATE TABLE party_class_manage_participant
 (
-    id                    BIGINT       NOT NULL COMMENT '主键编号' PRIMARY KEY,
-    create_user_id        BIGINT       NULL COMMENT '创建人',
-    create_date           DATETIME     NULL COMMENT '创建时间',
-    modify_user_id        BIGINT       NULL COMMENT '修改人',
-    modify_date           DATETIME     NULL COMMENT '修改时间',
-    delete_mark           INT          NOT NULL COMMENT '删除标记',
-    enabled_mark          INT          NOT NULL COMMENT '有效标志',
-    sort_code             INT          NULL COMMENT '序号',
-
-    party_class_manage_id BIGINT       NOT NULL COMMENT '党课管理id',
-
-    participant_id        BIGINT       NULL COMMENT '活动参与人id',
-    participant_remark    VARCHAR(256) NULL COMMENT '活动参与人类型',
-    participant_username  VARCHAR(256) NULL COMMENT '活动参与人oa',
-    participant_user_id   VARCHAR(256) NULL COMMENT '活动参与人学号，工号',
-    participant_name      VARCHAR(256) NULL COMMENT '活动参与人姓名'
-
-) ENGINE = INNODB
+    id                    bigint       not null comment '主键编号' primary key,
+    create_user_id        bigint       null comment '创建人',
+    create_date           datetime     null comment '创建时间',
+    modify_user_id        bigint       null comment '修改人',
+    modify_date           datetime     null comment '修改时间',
+    delete_mark           int          not null comment '删除标记',
+    enabled_mark          int          not null comment '有效标志',
+    sort_code             int          null comment '序号',
+
+    party_class_manage_id bigint       not null comment '党课管理id',
+
+    participant_id        bigint       null comment '活动参与人id',
+    participant_remark    varchar(256) null comment '活动参与人类型',
+    participant_username  varchar(256) null comment '活动参与人oa',
+    participant_user_id   varchar(256) null comment '活动参与人学号，工号',
+    participant_name      varchar(256) null comment '活动参与人姓名'
+
+) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
     COMMENT ='党课活动参与人表';
 
@@ -142,27 +142,27 @@ CREATE TABLE party_class_manage_participant
 DROP TABLE IF EXISTS `party_build_event`;
 CREATE TABLE party_build_event
 (
-    id                 BIGINT       NOT NULL COMMENT '主键编号'
-        PRIMARY KEY,
-    create_user_id     BIGINT       NULL COMMENT '创建人',
-    create_date        DATETIME     NULL COMMENT '创建时间',
-    modify_user_id     BIGINT       NULL COMMENT '修改人',
-    modify_date        DATETIME     NULL COMMENT '修改时间',
-    delete_mark        INT          NOT NULL COMMENT '删除标记',
-    enabled_mark       INT          NOT NULL COMMENT '有效标志',
-    sort_code          INT          NULL COMMENT '序号',
-
-    event_type         VARCHAR(255) NOT NULL COMMENT '活动类型',
-    party_tissue_id    BIGINT       NOT NULL COMMENT '党组织主键id(party_tissue_manager)',
-    party_tissue_name  VARCHAR(256) NOT NULL COMMENT '党组织名称',
-    party_tissue_code  VARCHAR(256) NOT NULL COMMENT '党组织编号',
-    event_address      VARCHAR(255) NULL COMMENT '活动地点',
-    event_content      TEXT         NULL COMMENT '活动内容',
-    event_start_time   DATE         NOT NULL COMMENT '活动开始时间',
-    event_end_time     DATE         NOT NULL COMMENT '活动结束时间',
-    attend_teacher_num INT          NULL COMMENT '参于教师数',
-    attend_student_num INT          NULL COMMENT '参于学生数'
-) ENGINE = INNODB
+    id                 bigint       not null comment '主键编号'
+        primary key,
+    create_user_id     bigint       null comment '创建人',
+    create_date        datetime     null comment '创建时间',
+    modify_user_id     bigint       null comment '修改人',
+    modify_date        datetime     null comment '修改时间',
+    delete_mark        int          not null comment '删除标记',
+    enabled_mark       int          not null comment '有效标志',
+    sort_code          int          null comment '序号',
+
+    event_type         varchar(255) not null comment '活动类型',
+    party_tissue_id    bigint       not null comment '党组织主键id(party_tissue_manager)',
+    party_tissue_name  varchar(256) not null comment '党组织名称',
+    party_tissue_code  varchar(256) not null comment '党组织编号',
+    event_address      varchar(255) null comment '活动地点',
+    event_content      text         null comment '活动内容',
+    event_start_time   date         not null comment '活动开始时间',
+    event_end_time     date         not null comment '活动结束时间',
+    attend_teacher_num int          null comment '参于教师数',
+    attend_student_num int          null comment '参于学生数'
+) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
     COMMENT ='党建活动';
 
@@ -170,182 +170,24 @@ CREATE TABLE party_build_event
 DROP TABLE IF EXISTS `party_build_event_participant`;
 CREATE TABLE `party_build_event_participant`
 (
-    id                   BIGINT       NOT NULL COMMENT '主键编号'
-        PRIMARY KEY,
-    create_user_id       BIGINT       NULL COMMENT '创建人',
-    create_date          DATETIME     NULL COMMENT '创建时间',
-    modify_user_id       BIGINT       NULL COMMENT '修改人',
-    modify_date          DATETIME     NULL COMMENT '修改时间',
-    delete_mark          INT          NOT NULL COMMENT '删除标记',
-    enabled_mark         INT          NOT NULL COMMENT '有效标志',
-    sort_code            INT          NULL COMMENT '序号',
-
-    party_build_event_id BIGINT       NULL COMMENT '党建活动主键id（party_build_event）',
-    participant_id       BIGINT       NULL COMMENT '参与活动人id',
-    participant_remark   VARCHAR(256) NULL COMMENT '活动参与人类型',
-    participant_username VARCHAR(256) NULL COMMENT '活动参与人oa',
-    participant_user_id  VARCHAR(256) NULL COMMENT '活动参与人学号，工号',
-    participant_name     VARCHAR(256) NULL COMMENT '活动参与人姓名'
-) ENGINE = INNODB
+    id                   bigint       not null comment '主键编号'
+        primary key,
+    create_user_id       bigint       null comment '创建人',
+    create_date          datetime     null comment '创建时间',
+    modify_user_id       bigint       null comment '修改人',
+    modify_date          datetime     null comment '修改时间',
+    delete_mark          int          not null comment '删除标记',
+    enabled_mark         int          not null comment '有效标志',
+    sort_code            int          null comment '序号',
+
+    party_build_event_id bigint       null comment '党建活动主键id（party_build_event）',
+    participant_id       bigint       null comment '参与活动人id',
+    participant_remark   varchar(256) null comment '活动参与人类型',
+    participant_username varchar(256) null comment '活动参与人oa',
+    participant_user_id  varchar(256) null comment '活动参与人学号，工号',
+    participant_name     varchar(256) null comment '活动参与人姓名'
+) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
-    COMMENT '党建活动参与人员';
-
-ALTER TABLE `whitelist_management`   
-  CHANGE `phone` `phone` VARCHAR(20) NOT NULL   COMMENT '手机号';
-
-DROP TABLE IF EXISTS patrol_offline_courses;   
-CREATE TABLE `patrol_offline_courses` (
-  `id` BIGINT NOT NULL,
-  `create_user_id` BIGINT DEFAULT NULL COMMENT '创建人',
-  `create_date` DATE DEFAULT NULL COMMENT '创建时间',
-  `modify_user_id` BIGINT DEFAULT NULL COMMENT '修改人',
-  `modify_date` DATE DEFAULT NULL COMMENT '修改日期',
-  `delete_mark` INT DEFAULT NULL COMMENT '删除标记',
-  `enabled_mark` INT DEFAULT NULL COMMENT '有效标记',
-  `semester_id` BIGINT DEFAULT NULL COMMENT '学期',
-  `now_date` DATETIME DEFAULT NULL COMMENT '当前日期',
-  `classroom_id` BIGINT DEFAULT NULL COMMENT '教室id',
-  `class_id` BIGINT DEFAULT NULL COMMENT '班级id',
-  `now_course` BIGINT DEFAULT NULL COMMENT '当前课程id',
-  `now_teacher_id` BIGINT DEFAULT NULL COMMENT '当前教师id',
-  `should_arrive_number` INT DEFAULT NULL COMMENT '应到人数',
-  `leave_number` INT DEFAULT NULL COMMENT '请假人数',
-  `actua_arrive_number` INT DEFAULT NULL COMMENT '实到人数',
-  `not_arrived_number` INT DEFAULT NULL COMMENT '未到人数',
-  `attendance_status` VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '出勤情况',
-  `to_post_status` VARCHAR(255) DEFAULT NULL COMMENT '到岗情况',
-  `class_interaction` VARCHAR(255) DEFAULT NULL COMMENT '课堂互动情况',
-  `teach_condition` VARCHAR(255) DEFAULT NULL COMMENT '教学条件情况',
-  `class_discipline` VARCHAR(255) DEFAULT NULL COMMENT '上课纪律',
-  `remark` VARCHAR(500) DEFAULT NULL COMMENT '备注',
-  `status` INT DEFAULT NULL COMMENT '流程状态',
-  PRIMARY KEY (`id`)
-) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='线下巡课表';
-
--- --------------------------------------------------------------------------------------------
--- 考试科目成绩表
--- --------------------------------------------------------------------------------------------
-DROP TABLE IF EXISTS exam_subject_score;   
-CREATE TABLE `exam_subject_score` (
-  `id` BIGINT NOT NULL,
-  `create_user_id` BIGINT DEFAULT NULL COMMENT '创建人',
-  `create_date` DATETIME DEFAULT NULL COMMENT '创建时间',
-  `modify_user_id` BIGINT DEFAULT NULL COMMENT '修改人',
-  `modify_date` DATETIME DEFAULT NULL COMMENT '修改日期',
-  `delete_mark` INT DEFAULT NULL COMMENT '删除标记',
-  `enabled_mark` INT DEFAULT NULL COMMENT '有效标记',
-  `semester_id` BIGINT DEFAULT NULL COMMENT '学期',
-  `milexamname` VARCHAR(50) DEFAULT NULL COMMENT '考试计划',
-  `milexamid` BIGINT DEFAULT NULL COMMENT '考试计划id',
-  `course_subject_id` BIGINT DEFAULT NULL COMMENT '课程科目id(base_course_subject)',
-  `coursename` VARCHAR(50) DEFAULT NULL COMMENT '课程名称',
-  `score` INT DEFAULT NULL COMMENT '分数',
-  `class_ranking` INT DEFAULT NULL COMMENT '班级排名',
-  `grade_ranking` INT DEFAULT NULL COMMENT '年级排名',
-  `user_id` BIGINT DEFAULT NULL COMMENT '学生id(xjr_user)',
-  PRIMARY KEY (`id`)
-) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='考试科目成绩表';
-
-
--- --------------------------------------------------------------------------------------------
--- 晓羊策学考试计划表
--- --------------------------------------------------------------------------------------------
-DROP TABLE IF EXISTS xycxedu_exam_list;   
-CREATE TABLE `xycxedu_exam_list` (
-  `id` BIGINT NOT NULL,
-  `create_date` DATETIME DEFAULT NULL COMMENT '创建时间',
-  `modify_date` DATETIME DEFAULT NULL COMMENT '修改日期',
-  `delete_mark` INT DEFAULT NULL COMMENT '删除标记',
-  `milexamid` BIGINT DEFAULT NULL COMMENT '考试计划id',
-  `milexamname` VARCHAR(50) DEFAULT NULL COMMENT '考试计划名称',
-  regyear INT DEFAULT NULL COMMENT '学年',
-  grade VARCHAR(20) DEFAULT NULL COMMENT '年级名称',
-  sdate DATE DEFAULT NULL COMMENT '考试时间',
-  PRIMARY KEY (`id`)
-) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='晓羊策学考试计划表';
-
--- --------------------------------------------------------------------------------------------
--- 考试计划维护
--- --------------------------------------------------------------------------------------------
-DROP TABLE IF EXISTS exam_plan;   
-CREATE TABLE `exam_plan` (
-  `id` BIGINT NOT NULL,
-  `create_user_id` BIGINT DEFAULT NULL COMMENT '创建人',
-  `create_date` DATETIME DEFAULT NULL COMMENT '创建时间',
-  `modify_user_id` BIGINT DEFAULT NULL COMMENT '修改人',
-  `modify_date` DATETIME DEFAULT NULL COMMENT '修改日期',
-  `delete_mark` INT DEFAULT NULL COMMENT '删除标记',
-  `enabled_mark` INT DEFAULT NULL COMMENT '有效标记',
-  `semester_id` BIGINT DEFAULT NULL COMMENT '学期id',
-  `name` VARCHAR(50) DEFAULT NULL COMMENT '考试计划名称',
-  milexamids TEXT DEFAULT NULL COMMENT '晓羊策学考试计划id',
-  PRIMARY KEY (`id`)
-) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='考试计划维护';
-
-
--- --------------------------------------------------------------------------------------------
--- 活动信息
--- --------------------------------------------------------------------------------------------
-DROP TABLE IF EXISTS activity_info;   
-CREATE TABLE `activity_info` (
-  `id` BIGINT NOT NULL,
-  `create_user_id` BIGINT DEFAULT NULL COMMENT '创建人',
-  `create_date` DATETIME DEFAULT NULL COMMENT '创建时间',
-  `modify_user_id` BIGINT DEFAULT NULL COMMENT '修改人',
-  `modify_date` DATETIME DEFAULT NULL COMMENT '修改日期',
-  `delete_mark` INT DEFAULT NULL COMMENT '删除标记',
-  `enabled_mark` INT DEFAULT NULL COMMENT '有效标记',
-  `name` VARCHAR(50) DEFAULT NULL COMMENT '赛事名称',
-  place VARCHAR(50) DEFAULT NULL COMMENT '活动地点',
-  start_date DATETIME DEFAULT NULL COMMENT '活动开始时间',
-  end_date DATETIME DEFAULT NULL COMMENT '活动结束时间',
-  `type` VARCHAR(50) DEFAULT NULL COMMENT '活动类型(xjr_dictionary_detail[match_activity_type])',
-  org_id BIGINT DEFAULT NULL COMMENT '组织部门(xjr_department)',
-  `enroll_end_time` DATETIME DEFAULT NULL COMMENT '报名结束时间',
-  `duty_person` VARCHAR(50) DEFAULT NULL COMMENT '活动负责人',
-  `duty_person_mobile` VARCHAR(50) DEFAULT NULL COMMENT '活动负责人电话',
-  `cover_file_id` VARCHAR(50) DEFAULT NULL COMMENT '封面图片',
-  `enroll_range` LONGTEXT DEFAULT NULL COMMENT '报名范围',
-  STATUS INT DEFAULT 0 COMMENT '状态(0:未发布 1:报名中 2:报名结束 3:活动结束)',
-  `content` LONGTEXT DEFAULT NULL COMMENT '活动内容',
-  enterprise_id BIGINT DEFAULT NULL COMMENT '合作企业',
-  category INT DEFAULT NULL COMMENT '1:校企合作活动 2:赛事活动',
-  PRIMARY KEY (`id`)
-) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='活动信息';
+    comment '党建活动参与人员';
 
--- --------------------------------------------------------------------------------------------
--- 活动报名范围
--- --------------------------------------------------------------------------------------------
-DROP TABLE IF EXISTS activity_enroll_range;
-CREATE TABLE `activity_enroll_range` (
-  `id` BIGINT NOT NULL,
-  `create_user_id` BIGINT DEFAULT NULL,
-  `create_date` DATETIME(3) DEFAULT NULL,
-  `modify_user_id` BIGINT DEFAULT NULL,
-  `modify_date` DATETIME(3) DEFAULT NULL,
-  `delete_mark` INT DEFAULT NULL,
-  `enabled_mark` INT DEFAULT NULL,
-  `class_id` BIGINT DEFAULT NULL COMMENT '所属班级id',
-  `dept_id` BIGINT DEFAULT NULL COMMENT '所属部门id',
-  `user_id` BIGINT DEFAULT NULL COMMENT '用id',
-  activity_info_id BIGINT DEFAULT NULL COMMENT '活动(activity)',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='活动报名范围';
 
--- --------------------------------------------------------------------------------------------
--- 活动登记表
--- --------------------------------------------------------------------------------------------
-DROP TABLE IF EXISTS activity_enroll;   
-CREATE TABLE `activity_enroll` (
-  `id` BIGINT NOT NULL,
-  `create_user_id` BIGINT DEFAULT NULL COMMENT '创建人',
-  `create_date` DATETIME DEFAULT NULL COMMENT '创建时间',
-  `modify_user_id` BIGINT DEFAULT NULL COMMENT '修改人',
-  `modify_date` DATETIME DEFAULT NULL COMMENT '修改日期',
-  `delete_mark` INT DEFAULT NULL COMMENT '删除标记',
-  `enabled_mark` INT DEFAULT NULL COMMENT '有效标记',
-  activity_info_id BIGINT DEFAULT NULL COMMENT '活动(activity_info)',
-  user_id DATETIME DEFAULT NULL COMMENT '参与人(xjr_user)',
-  STATUS INT DEFAULT 0 COMMENT '状态(0:待确认 1:未参与 2:已参与)',
-  PRIMARY KEY (`id`)
-) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='活动登记表';