Kaynağa Gözat

实习教师收集审核

dzx 5 ay önce
ebeveyn
işleme
73b3378391

+ 1 - 0
src/main/java/com/xjrsoft/module/internship/controller/InternshipTeacherCollectController.java

@@ -130,6 +130,7 @@ public class InternshipTeacherCollectController {
                 .select(User::getName)
                 .select(User::getMobile)
                 .select(User::getUserName)
+                .select(InternshipTeacherCollectEnroll::getStatus)
                 .innerJoin(User.class, User::getId, InternshipTeacherCollectEnroll::getUserId)
                 .eq(InternshipTeacherCollectEnroll::getInternshipTeacherCollectId, dto.getInternshipTeacherCollectId())
                 .orderByDesc(InternshipTeacherCollect::getId);

+ 4 - 1
src/main/java/com/xjrsoft/module/internship/controller/InternshipTeacherCollectEnrollController.java

@@ -98,7 +98,10 @@ public class InternshipTeacherCollectEnrollController {
             enrollVo.setMobile(user.getMobile());
         }
         if(internshipTeacherCollectEnroll.getFolderId() != null){
-            File file = fileService.getById(internshipTeacherCollectEnroll.getFolderId());
+            File file = fileService.getOne(
+                    new QueryWrapper<File>().lambda()
+                    .eq(File::getFolderId, internshipTeacherCollectEnroll.getFolderId())
+            );
             if(file != null){
                 enrollVo.setFileUrl(file.getFileUrl());
             }

+ 44 - 0
src/main/resources/sqlScript/20250623sql.sql

@@ -110,3 +110,47 @@ CREATE TABLE `internship_teacher_collect_enroll` (
   PRIMARY KEY (`id`)
 ) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='实习带队教师报名表';
 
+
+-- -------------------------------------------------------------------------------------------------------------------
+-- 学生特异体质登记表
+-- -------------------------------------------------------------------------------------------------------------------
+DROP TABLE IF EXISTS student_special_constitution;
+CREATE TABLE `student_special_constitution` (
+  `id` BIGINT NOT NULL COMMENT '主键编号',
+  `create_date` DATETIME DEFAULT NULL COMMENT '创建时间',
+  `modify_date` DATETIME DEFAULT NULL COMMENT '修改时间',
+  `delete_mark` INT NOT NULL COMMENT '删除标记',
+  `enabled_mark` INT NOT NULL COMMENT '有效标志',
+  `modify_user_id` BIGINT DEFAULT NULL,
+  `create_user_id` BIGINT DEFAULT NULL,
+  `reason` VARCHAR(500) DEFAULT NULL COMMENT '缘由',
+  `student_user_id` BIGINT NOT NULL COMMENT '登记学生(xjr_user)',
+  `class_id` BIGINT DEFAULT NULL COMMENT '所属班级(base_class)',
+  PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='学生特异体质登记表';
+
+
+-- -------------------------------------------------------------------------------------------------------------------
+-- 学生自主实习申请表
+-- -------------------------------------------------------------------------------------------------------------------
+DROP TABLE IF EXISTS student_internship_alone_apply;
+CREATE TABLE `student_internship_alone_apply` (
+  `id` BIGINT NOT NULL COMMENT '主键编号',
+  `create_date` DATETIME DEFAULT NULL COMMENT '创建时间',
+  `modify_date` DATETIME DEFAULT NULL COMMENT '修改时间',
+  `delete_mark` INT NOT NULL COMMENT '删除标记',
+  `enabled_mark` INT NOT NULL COMMENT '有效标志',
+  `modify_user_id` BIGINT DEFAULT NULL,
+  `create_user_id` BIGINT DEFAULT NULL,
+  `reason` VARCHAR(500) DEFAULT NULL COMMENT '缘由',
+  `student_user_id` BIGINT NOT NULL COMMENT '登记学生(xjr_user)',
+  `class_id` BIGINT DEFAULT NULL COMMENT '所属班级(base_class)',
+  `internship_plan_manage_id` BIGINT NOT NULL COMMENT '所属实习计划id(internship_plan_manage)',
+  `folder_id` BIGINT DEFAULT NULL COMMENT '附件(xjr_file)',
+  PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='学生自主实习申请表';
+
+
+
+
+