学生实习记录

src/main/java/com/xjrsoft/module/internship/controller/InternshipPlanManageParticipantController.java

@@ -112,7 +112,6 @@ public class InternshipPlanManageParticipantController {
     @XjrLog(value = "删除实习计划参与人表")
     public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
         return RT.ok(internshipPlanManageParticipantService.removeBatchByIds(ids));
-
     }
 
 }

src/main/java/com/xjrsoft/module/internship/controller/InternshipPlanTeacherController.java

@@ -1,7 +1,6 @@
 package com.xjrsoft.module.internship.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xjrsoft.common.annotation.XjrLog;
 import com.xjrsoft.common.model.result.RT;
@@ -10,7 +9,6 @@ import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.module.internship.dto.AddInternshipPlanTeacherDto;
 import com.xjrsoft.module.internship.dto.InternshipPlanTeacherPageDto;
 import com.xjrsoft.module.internship.dto.UpdateInternshipPlanTeacherDto;
-import com.xjrsoft.module.internship.entity.InternshipPlanTeacher;
 import com.xjrsoft.module.internship.service.IInternshipPlanTeacherService;
 import com.xjrsoft.module.internship.vo.InternshipPlanTeacherPageVo;
 import com.xjrsoft.module.internship.vo.InternshipPlanTeacherVo;

src/main/java/com/xjrsoft/module/internship/entity/StudentInternshipAloneApply.java

@@ -0,0 +1,110 @@
+package com.xjrsoft.module.internship.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+/**
+* @title: 学生实习记录表
+* @Author dzx
+* @Date: 2025-07-01
+* @Version 1.0
+*/
+@Data
+@TableName("student_internship_alone_apply")
+@ApiModel(value = "student_internship_alone_apply", description = "学生自主实习申请表")
+public class StudentInternshipAloneApply implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    @TableId
+    private Long id;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createDate;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    @TableField(fill = FieldFill.UPDATE)
+    private LocalDateTime modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+
+    @ApiModelProperty("缘由")
+    private String reason;
+
+    @ApiModelProperty("登记学生(xjr_user)")
+    private Long studentUserId;
+    /**
+    * 实习时间
+    */
+    @ApiModelProperty("所属班级(base_class)")
+    private Long classId;
+
+
+    /**
+    * 所属实习计划id(internship_plan_manage)
+    */
+    @ApiModelProperty("所属实习计划id(internship_plan_manage)")
+    private Long internshipPlanManageId;
+
+    /**
+    * 附件(xjr_file)
+    */
+    @ApiModelProperty("申请附件(xjr_file)")
+    private Long folderId;
+
+
+    @ApiModelProperty("实习报告内容")
+    private String reportContent;
+
+    @ApiModelProperty("合同附件(xjr_file)")
+    private Long contractFolderId;
+
+    @ApiModelProperty("工资流水附件(xjr_file)")
+    private Long wagesFolderId;
+
+    @ApiModelProperty("总结材料附件(xjr_file)")
+    private Long summarizeFolderId;
+
+}

src/main/java/com/xjrsoft/module/internship/service/impl/InternshipPlanManageServiceImpl.java

@@ -27,8 +27,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
 
 /**
 * @title: 实习计划管理表

src/main/resources/mapper/internship/InternshipPlanManageMapper.xml

@@ -47,7 +47,7 @@
         <if test="dto.baseSemesterId != null">
             and t1.base_semester_id = #{dto.baseSemesterId}
         </if>
-        <if test="dto.teacheId != null">
+        <if test="dto.teacherId != null">
             and (t1.id in (
                 SELECT DISTINCT c1.internship_plan_manage_id FROM internship_plan_class c1
                 INNER JOIN base_class c2 ON c1.class_id = c2.id

src/main/resources/sqlScript/20250623sql.sql

@@ -146,7 +146,11 @@ CREATE TABLE `student_internship_alone_apply` (
   `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)',
+  `folder_id` BIGINT DEFAULT NULL COMMENT '申请附件(xjr_file)',
+  `report_content` VARCHAR(1000) DEFAULT NULL COMMENT '实习报告内容',
+  `contract_folder_id` BIGINT DEFAULT NULL COMMENT '附件(xjr_file)',
+  `wages_folder_id` BIGINT DEFAULT NULL COMMENT '附件(xjr_file)',
+  `summarize_folder_id` BIGINT DEFAULT NULL COMMENT '附件(xjr_file)',
   PRIMARY KEY (`id`)
 ) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='学生自主实习申请表';
 
@@ -167,10 +171,11 @@ CREATE TABLE `student_internship_record` (
   `record_time` DATETIME DEFAULT NULL COMMENT '实习时间',
   `record_report_type` INT DEFAULT NULL COMMENT '实行类型(0:实习综合报告 1:周报 2:月报)',
   `internship_plan_manage_id` BIGINT NOT NULL COMMENT '所属实习计划id(internship_plan_manage)',
+  `is_internship_alone` INT NOT NULL COMMENT '是否自主实习(1:是 0:否)',
   `record_content` VARCHAR(1000) DEFAULT NULL COMMENT '实习报告内容',
   `folder_id` BIGINT DEFAULT NULL COMMENT '附件(xjr_file)',
   PRIMARY KEY (`id`)
-) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='学生自主实习申请表';
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='学生实习记录表';
 
 
 

src/test/java/com/xjrsoft/xjrsoftboot/FreeMarkerGeneratorTest.java

@@ -5228,4 +5228,29 @@ public class FreeMarkerGeneratorTest {
 
         apiGeneratorService.generateCodes(params);
     }
+
+    @Test
+    public void gcstudent_internship_record() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("student_internship_record");//init_sql中的表名
+        mainTable.setIsMain(true);//是否是主表，一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        tableConfigs.add(mainTable);
+
+        ApiGenerateCodesDto params = new ApiGenerateCodesDto();
+        params.setAuthor("dzx");//作者名称
+        params.setPackageName("internship");//包名
+        params.setTableConfigs(tableConfigs);
+        params.setPage(true);//是否生成分页接口
+        params.setImport(false);//是否生成导入接口
+        params.setExport(false);//是否生成导出接口
+        params.setOutMainDir(true);//是否生成在主目录，前期测试可设置成false
+        params.setDs(ds);
+
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+    }
 }