Merge remote-tracking branch 'origin/dev' into dev

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

@@ -0,0 +1,108 @@
+package com.xjrsoft.module.internship.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.xjrsoft.common.annotation.XjrLog;
+import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.internship.dto.AddInternshipPlanManageParticipantDto;
+import com.xjrsoft.module.internship.dto.InternshipPlanManageParticipantPageDto;
+import com.xjrsoft.module.internship.dto.UpdateInternshipPlanManageParticipantDto;
+import com.xjrsoft.module.internship.entity.InternshipPlanManageParticipant;
+import com.xjrsoft.module.internship.service.IInternshipPlanManageParticipantService;
+import com.xjrsoft.module.internship.vo.InternshipPlanManageParticipantPageVo;
+import com.xjrsoft.module.internship.vo.InternshipPlanManageParticipantVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+* @title: 实习计划参与人表
+* @Author dzx
+* @Date: 2025-06-26
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/internship" + "/internshipPlanManageParticipant")
+@Api(value = "/internship"  + "/internshipPlanManageParticipant",tags = "实习计划参与人表代码")
+@AllArgsConstructor
+public class InternshipPlanManageParticipantController {
+
+
+    private final IInternshipPlanManageParticipantService internshipPlanManageParticipantService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="实习计划参与人表列表(分页)")
+    @SaCheckPermission("internshipplanmanageparticipant:detail")
+    @XjrLog(value = "实习计划参与人表列表(分页)")
+    public RT<PageOutput<InternshipPlanManageParticipantPageVo>> page(@Valid InternshipPlanManageParticipantPageDto dto){
+
+        MPJLambdaWrapper<InternshipPlanManageParticipant> queryWrapper = new MPJLambdaWrapper<>();
+        queryWrapper
+                    .orderByDesc(InternshipPlanManageParticipant::getId)
+                .select(InternshipPlanManageParticipant.class,x -> VoToColumnUtil.fieldsToColumns(InternshipPlanManageParticipantPageVo.class).contains(x.getProperty()));
+        IPage<InternshipPlanManageParticipant> page = internshipPlanManageParticipantService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<InternshipPlanManageParticipantPageVo> pageOutput = ConventPage.getPageOutput(page, InternshipPlanManageParticipantPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询实习计划参与人表信息")
+    @SaCheckPermission("internshipplanmanageparticipant:detail")
+    @XjrLog(value = "根据id查询实习计划参与人表信息")
+    public RT<InternshipPlanManageParticipantVo> info(@RequestParam Long id){
+        InternshipPlanManageParticipant internshipPlanManageParticipant = internshipPlanManageParticipantService.getById(id);
+        if (internshipPlanManageParticipant == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(internshipPlanManageParticipant, InternshipPlanManageParticipantVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增实习计划参与人表")
+    @SaCheckPermission("internshipplanmanageparticipant:add")
+    @XjrLog(value = "新增实习计划参与人表")
+    public RT<Boolean> add(@Valid @RequestBody AddInternshipPlanManageParticipantDto dto){
+        InternshipPlanManageParticipant internshipPlanManageParticipant = BeanUtil.toBean(dto, InternshipPlanManageParticipant.class);
+        boolean isSuccess = internshipPlanManageParticipantService.save(internshipPlanManageParticipant);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改实习计划参与人表")
+    @SaCheckPermission("internshipplanmanageparticipant:edit")
+    @XjrLog(value = "修改实习计划参与人表")
+    public RT<Boolean> update(@Valid @RequestBody UpdateInternshipPlanManageParticipantDto dto){
+
+        InternshipPlanManageParticipant internshipPlanManageParticipant = BeanUtil.toBean(dto, InternshipPlanManageParticipant.class);
+        return RT.ok(internshipPlanManageParticipantService.updateById(internshipPlanManageParticipant));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除实习计划参与人表")
+    @SaCheckPermission("internshipplanmanageparticipant:delete")
+    @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/InternshipTeacherCollectController.java

@@ -10,11 +10,11 @@ import com.xjrsoft.common.annotation.XjrLog;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.common.utils.LocalDateUtil;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.base.entity.BaseSemester;
 import com.xjrsoft.module.internship.dto.AddInternshipTeacherCollectDto;
 import com.xjrsoft.module.internship.dto.InternshipTeacherCollectEnrollExamPageDto;
-import com.xjrsoft.module.internship.dto.InternshipTeacherCollectEnrollPageDto;
 import com.xjrsoft.module.internship.dto.InternshipTeacherCollectPageDto;
 import com.xjrsoft.module.internship.dto.UpdateInternshipTeacherCollectDto;
 import com.xjrsoft.module.internship.entity.InternshipTeacherCollect;
@@ -38,6 +38,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.time.LocalDate;
 import java.util.List;
 
 /**
@@ -95,6 +96,17 @@ public class InternshipTeacherCollectController {
     @XjrLog(value = "新增实习带队教师收集表")
     public RT<Boolean> add(@Valid @RequestBody AddInternshipTeacherCollectDto dto){
         InternshipTeacherCollect internshipTeacherCollect = BeanUtil.toBean(dto, InternshipTeacherCollect.class);
+        LocalDate now = LocalDate.now();
+        boolean dateInRange = LocalDateUtil.isDateInRange(now, internshipTeacherCollect.getStartDate(), internshipTeacherCollect.getEndDate());
+        if(dateInRange){
+            internshipTeacherCollect.setStatus(1);
+        }else{
+            if(now.isBefore(internshipTeacherCollect.getStartDate())){
+                internshipTeacherCollect.setStatus(0);
+            }else if(now.isAfter(internshipTeacherCollect.getStartDate())){
+                internshipTeacherCollect.setStatus(2);
+            }
+        }
         boolean isSuccess = internshipTeacherCollectService.save(internshipTeacherCollect);
         return RT.ok(isSuccess);
     }
@@ -104,10 +116,19 @@ public class InternshipTeacherCollectController {
     @SaCheckPermission("internshipteachercollect:edit")
     @XjrLog(value = "修改实习带队教师收集表")
     public RT<Boolean> update(@Valid @RequestBody UpdateInternshipTeacherCollectDto dto){
-
         InternshipTeacherCollect internshipTeacherCollect = BeanUtil.toBean(dto, InternshipTeacherCollect.class);
+        LocalDate now = LocalDate.now();
+        boolean dateInRange = LocalDateUtil.isDateInRange(now, internshipTeacherCollect.getStartDate(), internshipTeacherCollect.getEndDate());
+        if(dateInRange){
+            internshipTeacherCollect.setStatus(1);
+        }else{
+            if(now.isBefore(internshipTeacherCollect.getStartDate())){
+                internshipTeacherCollect.setStatus(0);
+            }else if(now.isAfter(internshipTeacherCollect.getStartDate())){
+                internshipTeacherCollect.setStatus(2);
+            }
+        }
         return RT.ok(internshipTeacherCollectService.updateById(internshipTeacherCollect));
-
     }
 
     @DeleteMapping
@@ -131,6 +152,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);

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

@@ -3,6 +3,7 @@ package com.xjrsoft.module.internship.controller;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
@@ -14,22 +15,24 @@ import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.base.entity.BaseSemester;
 import com.xjrsoft.module.internship.dto.AddInternshipTeacherCollectEnrollDto;
-import com.xjrsoft.module.internship.dto.InternshipPlanManageStatusDto;
 import com.xjrsoft.module.internship.dto.InternshipTeacherCollectEnrollPageDto;
 import com.xjrsoft.module.internship.dto.InternshipTeacherCollectEnrollStatusDto;
 import com.xjrsoft.module.internship.dto.UpdateInternshipTeacherCollectEnrollDto;
-import com.xjrsoft.module.internship.entity.InternshipPlanManage;
 import com.xjrsoft.module.internship.entity.InternshipTeacherCollect;
 import com.xjrsoft.module.internship.entity.InternshipTeacherCollectEnroll;
 import com.xjrsoft.module.internship.service.IInternshipTeacherCollectEnrollService;
 import com.xjrsoft.module.internship.service.IInternshipTeacherCollectService;
+import com.xjrsoft.module.internship.vo.InternshipTeacherCollectEnrollExamPageVo;
+import com.xjrsoft.module.internship.vo.InternshipTeacherCollectEnrollListVo;
 import com.xjrsoft.module.internship.vo.InternshipTeacherCollectEnrollPageVo;
 import com.xjrsoft.module.internship.vo.InternshipTeacherCollectEnrollVo;
 import com.xjrsoft.module.internship.vo.InternshipTeacherCollectPageVo;
 import com.xjrsoft.module.organization.entity.User;
 import com.xjrsoft.module.organization.service.IUserService;
+import com.xjrsoft.module.system.entity.DictionaryDetail;
 import com.xjrsoft.module.system.entity.File;
 import com.xjrsoft.module.system.service.IFileService;
+import com.xjrsoft.module.teacher.entity.BaseTeacher;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -70,6 +73,7 @@ public class InternshipTeacherCollectEnrollController {
 
         MPJLambdaWrapper<InternshipTeacherCollect> queryWrapper = new MPJLambdaWrapper<>();
         queryWrapper
+                .select(InternshipTeacherCollect::getId)
                 .select(InternshipTeacherCollect.class,x -> VoToColumnUtil.fieldsToColumns(InternshipTeacherCollectPageVo.class).contains(x.getProperty()))
                 .selectAs(BaseSemester::getName, InternshipTeacherCollectPageVo::getBaseSemesterName)
                 .select("(SELECT COUNT(*) FROM internship_teacher_collect_enroll WHERE delete_mark = 0 AND internship_teacher_collect_id = t.id AND user_id = " + StpUtil.getLoginIdAsLong() +") as is_enroll")
@@ -97,8 +101,13 @@ public class InternshipTeacherCollectEnrollController {
             enrollVo.setMobile(user.getMobile());
         }
         if(internshipTeacherCollectEnroll.getFolderId() != null){
-            File file = fileService.getById(internshipTeacherCollectEnroll.getFolderId());
-            enrollVo.setFileUrl(file.getFileUrl());
+            File file = fileService.getOne(
+                    new QueryWrapper<File>().lambda()
+                    .eq(File::getFolderId, internshipTeacherCollectEnroll.getFolderId())
+            );
+            if(file != null){
+                enrollVo.setFileUrl(file.getFileUrl());
+            }
         }
 
         return RT.ok(enrollVo);
@@ -163,4 +172,51 @@ public class InternshipTeacherCollectEnrollController {
         return RT.ok(true);
     }
 
+    //
+    @GetMapping(value = "/all-page")
+    @ApiOperation(value="所有带队教师(分页)")
+    @SaCheckPermission("internshipteachercollectenroll:detail")
+    @XjrLog(value = "所有带队教师(分页)")
+    public RT<PageOutput<InternshipTeacherCollectEnrollExamPageVo>> allPage(@Valid InternshipTeacherCollectEnrollPageDto dto){
+
+        MPJLambdaWrapper<InternshipTeacherCollectEnroll> queryWrapper = new MPJLambdaWrapper<>();
+        queryWrapper
+                .select(InternshipTeacherCollectEnroll::getId)
+                .select(User::getName)
+                .select(User::getMobile)
+                .select(User::getUserName)
+                .select(InternshipTeacherCollectEnroll::getStatus)
+                .selectAs(DictionaryDetail::getName, InternshipTeacherCollectEnrollExamPageVo::getJobStateCn)
+                .select("t4.name as employ_type_cn")
+                .innerJoin(User.class, User::getId, InternshipTeacherCollectEnroll::getUserId)
+                .innerJoin(BaseTeacher.class, BaseTeacher::getUserId, InternshipTeacherCollectEnroll::getUserId)
+                .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, BaseTeacher::getJobState)
+                .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, BaseTeacher::getEmployType)
+                .like(StrUtil.isNotEmpty(dto.getName()), User::getName, dto.getName())
+                .like(StrUtil.isNotEmpty(dto.getUserName()), User::getUserName, dto.getUserName())
+                .like(StrUtil.isNotEmpty(dto.getMobile()), User::getMobile, dto.getMobile())
+                .orderByDesc(InternshipTeacherCollect::getId);
+        IPage<InternshipTeacherCollectEnrollExamPageVo> page = internshipTeacherCollectEnrollService.selectJoinListPage(ConventPage.getPage(dto), InternshipTeacherCollectEnrollExamPageVo.class, queryWrapper);
+        PageOutput<InternshipTeacherCollectEnrollExamPageVo> pageOutput = ConventPage.getPageOutput(page, InternshipTeacherCollectEnrollExamPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/list")
+    @ApiOperation(value="审核通过的带队老师")
+    @SaCheckPermission("internshipteachercollectenroll:detail")
+    @XjrLog(value = "审核通过的带队老师")
+    public RT<List<InternshipTeacherCollectEnrollListVo>> list(@Valid InternshipTeacherCollectEnrollPageDto dto){
+
+        MPJLambdaWrapper<InternshipTeacherCollectEnroll> queryWrapper = new MPJLambdaWrapper<>();
+        queryWrapper
+                .select(User::getId)
+                .select(User::getName)
+                .innerJoin(User.class, User::getId, InternshipTeacherCollectEnroll::getUserId)
+                .innerJoin(BaseTeacher.class, BaseTeacher::getUserId, InternshipTeacherCollectEnroll::getUserId)
+                .eq(InternshipTeacherCollectEnroll::getStatus, 1)
+                .orderByDesc(InternshipTeacherCollect::getId);
+        List<InternshipTeacherCollectEnrollListVo> list = internshipTeacherCollectEnrollService.selectJoinList(InternshipTeacherCollectEnrollListVo.class, queryWrapper);
+        return RT.ok(list);
+    }
+
 }

src/main/java/com/xjrsoft/module/internship/dto/AddInternshipPlanManageParticipantDto.java

@@ -0,0 +1,77 @@
+package com.xjrsoft.module.internship.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+
+/**
+* @title: 实习计划参与人表
+* @Author dzx
+* @Date: 2025-06-26
+* @Version 1.0
+*/
+@Data
+public class AddInternshipPlanManageParticipantDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 实习计划id
+    */
+    @ApiModelProperty("实习计划id")
+    private Long internshipPlanManageId;
+    /**
+    * 实习参与人id
+    */
+    @ApiModelProperty("实习参与人id")
+    private Long participantUserId;
+    /**
+    * 实习参与人学号
+    */
+    @ApiModelProperty("实习参与人学号")
+    private String participantUserStudentId;
+    /**
+    * 实习参与人姓名
+    */
+    @ApiModelProperty("实习参与人姓名")
+    private String participantUserName;
+    /**
+    * 所属专业id(base_major)
+    */
+    @ApiModelProperty("所属专业id(base_major)")
+    private Long baseMajorId;
+    /**
+    * 所属专业名称
+    */
+    @ApiModelProperty("所属专业名称")
+    private String baseMajorName;
+    /**
+    * 班级id(base_class)
+    */
+    @ApiModelProperty("班级id(base_class)")
+    private Long classId;
+    /**
+    * 班级名称
+    */
+    @ApiModelProperty("班级名称")
+    private String className;
+    /**
+    * 带队老师(xjr_user)
+    */
+    @ApiModelProperty("带队老师(xjr_user)")
+    private Long teacherId;
+    /**
+    * 实习结果评价
+    */
+    @ApiModelProperty("实习结果评价")
+    private String result;
+
+}

src/main/java/com/xjrsoft/module/internship/dto/InternshipPlanManageParticipantPageDto.java

@@ -0,0 +1,19 @@
+package com.xjrsoft.module.internship.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+* @title: 实习计划参与人表分页查询入参
+* @Author dzx
+* @Date: 2025-06-26
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class InternshipPlanManageParticipantPageDto extends PageInput {
+
+
+}

src/main/java/com/xjrsoft/module/internship/dto/InternshipTeacherCollectEnrollPageDto.java

@@ -1,6 +1,7 @@
 package com.xjrsoft.module.internship.dto;
 
 import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -15,5 +16,12 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = false)
 public class InternshipTeacherCollectEnrollPageDto extends PageInput {
 
+    @ApiModelProperty("工号")
+    private String userName;
 
+    @ApiModelProperty("教师姓名")
+    private String name;
+
+    @ApiModelProperty("联系电话")
+    private String mobile;
 }

src/main/java/com/xjrsoft/module/internship/dto/UpdateInternshipPlanManageParticipantDto.java

@@ -0,0 +1,24 @@
+package com.xjrsoft.module.internship.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+
+/**
+* @title: 实习计划参与人表
+* @Author dzx
+* @Date: 2025-06-26
+* @Version 1.0
+*/
+@Data
+public class UpdateInternshipPlanManageParticipantDto extends AddInternshipPlanManageParticipantDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

src/main/java/com/xjrsoft/module/veb/entity/InternshipPlanManageParticipant.java → src/main/java/com/xjrsoft/module/internship/entity/InternshipPlanManageParticipant.java

@@ -1,20 +1,24 @@
-package com.xjrsoft.module.veb.entity;
+package com.xjrsoft.module.internship.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+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.util.Date;
+import java.time.LocalDateTime;
 
 
 /**
- * @title: 实习计划参与人表
- * @Author dzx
- * @Date: 2024-12-11
- * @Version 1.0
- */
+* @title: 实习计划参与人表
+* @Author dzx
+* @Date: 2025-06-26
+* @Version 1.0
+*/
 @Data
 @TableName("internship_plan_manage_participant")
 @ApiModel(value = "internship_plan_manage_participant", description = "实习计划参与人表")
@@ -23,93 +27,103 @@ public class InternshipPlanManageParticipant implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 主键编号
-     */
+    * 主键编号
+    */
     @ApiModelProperty("主键编号")
     @TableId
     private Long id;
     /**
-     * 创建人
-     */
+    * 创建人
+    */
     @ApiModelProperty("创建人")
     @TableField(fill = FieldFill.INSERT)
     private Long createUserId;
     /**
-     * 创建时间
-     */
+    * 创建时间
+    */
     @ApiModelProperty("创建时间")
     @TableField(fill = FieldFill.INSERT)
-    private Date createDate;
+    private LocalDateTime createDate;
     /**
-     * 修改人
-     */
+    * 修改人
+    */
     @ApiModelProperty("修改人")
     @TableField(fill = FieldFill.UPDATE)
     private Long modifyUserId;
     /**
-     * 修改时间
-     */
+    * 修改时间
+    */
     @ApiModelProperty("修改时间")
     @TableField(fill = FieldFill.UPDATE)
-    private Date modifyDate;
+    private LocalDateTime modifyDate;
     /**
-     * 删除标记
-     */
+    * 删除标记
+    */
     @ApiModelProperty("删除标记")
     @TableField(fill = FieldFill.INSERT)
     @TableLogic
     private Integer deleteMark;
     /**
-     * 有效标志
-     */
+    * 有效标志
+    */
     @ApiModelProperty("有效标志")
     @TableField(fill = FieldFill.INSERT)
     private Integer enabledMark;
     /**
-     * 序号
-     */
+    * 序号
+    */
     @ApiModelProperty("序号")
     private Integer sortCode;
     /**
-     * 实习计划id
-     */
+    * 实习计划id
+    */
     @ApiModelProperty("实习计划id")
     private Long internshipPlanManageId;
     /**
-     * 实习参与人id
-     */
+    * 实习参与人id
+    */
     @ApiModelProperty("实习参与人id")
     private Long participantUserId;
     /**
-     * 实习参与人学号
-     */
+    * 实习参与人学号
+    */
     @ApiModelProperty("实习参与人学号")
     private String participantUserStudentId;
     /**
-     * 实习参与人姓名
-     */
+    * 实习参与人姓名
+    */
     @ApiModelProperty("实习参与人姓名")
     private String participantUserName;
     /**
-     * 所属专业id(base_major)
-     */
+    * 所属专业id(base_major)
+    */
     @ApiModelProperty("所属专业id(base_major)")
     private Long baseMajorId;
     /**
-     * 所属专业名称
-     */
+    * 所属专业名称
+    */
     @ApiModelProperty("所属专业名称")
     private String baseMajorName;
     /**
-     * 班级id(base_class)
-     */
+    * 班级id(base_class)
+    */
     @ApiModelProperty("班级id(base_class)")
     private Long classId;
     /**
-     * 班级名称
-     */
+    * 班级名称
+    */
     @ApiModelProperty("班级名称")
     private String className;
+    /**
+    * 带队老师(xjr_user)
+    */
+    @ApiModelProperty("带队老师(xjr_user)")
+    private Long teacherId;
+    /**
+    * 实习结果评价
+    */
+    @ApiModelProperty("实习结果评价")
+    private String result;
 
 
 }

src/main/java/com/xjrsoft/module/veb/mapper/InternshipPlanManageParticipantMapper.java → src/main/java/com/xjrsoft/module/internship/mapper/InternshipPlanManageParticipantMapper.java

@@ -1,15 +1,15 @@
-package com.xjrsoft.module.veb.mapper;
+package com.xjrsoft.module.internship.mapper;
 
 import com.github.yulichang.base.MPJBaseMapper;
-import com.xjrsoft.module.veb.entity.InternshipPlanManageParticipant;
+import com.xjrsoft.module.internship.entity.InternshipPlanManageParticipant;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
- * @title: 实习计划参与人表
- * @Author dzx
- * @Date: 2024-12-11
- * @Version 1.0
- */
+* @title: 实习计划参与人表
+* @Author dzx
+* @Date: 2025-06-26
+* @Version 1.0
+*/
 @Mapper
 public interface InternshipPlanManageParticipantMapper extends MPJBaseMapper<InternshipPlanManageParticipant> {
 

src/main/java/com/xjrsoft/module/internship/mapper/InternshipPlanTeacherMapper.java

@@ -6,6 +6,7 @@ import com.xjrsoft.module.internship.dto.InternshipPlanTeacherPageDto;
 import com.xjrsoft.module.internship.entity.InternshipPlanTeacher;
 import com.xjrsoft.module.internship.vo.InternshipPlanTeacherPageVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
 * @title: 实习计划带队老师表
@@ -16,5 +17,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface InternshipPlanTeacherMapper extends MPJBaseMapper<InternshipPlanTeacher> {
 
-    Page<InternshipPlanTeacherPageVo> getPage(Page<InternshipPlanTeacherPageVo> page, InternshipPlanTeacherPageDto dto);
+    Page<InternshipPlanTeacherPageVo> getPage(Page<InternshipPlanTeacherPageVo> page, @Param("dto") InternshipPlanTeacherPageDto dto);
 }

src/main/java/com/xjrsoft/module/internship/service/IInternshipPlanManageParticipantService.java

@@ -0,0 +1,14 @@
+package com.xjrsoft.module.internship.service;
+
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.internship.entity.InternshipPlanManageParticipant;
+
+/**
+* @title: 实习计划参与人表
+* @Author dzx
+* @Date: 2025-06-26
+* @Version 1.0
+*/
+
+public interface IInternshipPlanManageParticipantService extends MPJBaseService<InternshipPlanManageParticipant> {
+}

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

@@ -0,0 +1,19 @@
+package com.xjrsoft.module.internship.service.impl;
+
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.internship.entity.InternshipPlanManageParticipant;
+import com.xjrsoft.module.internship.mapper.InternshipPlanManageParticipantMapper;
+import com.xjrsoft.module.internship.service.IInternshipPlanManageParticipantService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+/**
+* @title: 实习计划参与人表
+* @Author dzx
+* @Date: 2025-06-26
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class InternshipPlanManageParticipantServiceImpl extends MPJBaseServiceImpl<InternshipPlanManageParticipantMapper, InternshipPlanManageParticipant> implements IInternshipPlanManageParticipantService {
+}

src/main/java/com/xjrsoft/module/internship/vo/InternshipPlanManageParticipantPageVo.java

@@ -0,0 +1,108 @@
+package com.xjrsoft.module.internship.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+* @title: 实习计划参与人表分页列表出参
+* @Author dzx
+* @Date: 2025-06-26
+* @Version 1.0
+*/
+@Data
+public class InternshipPlanManageParticipantPageVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    private LocalDateTime modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    private Integer enabledMark;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 实习计划id
+    */
+    @ApiModelProperty("实习计划id")
+    private Long internshipPlanManageId;
+    /**
+    * 实习参与人id
+    */
+    @ApiModelProperty("实习参与人id")
+    private Long participantUserId;
+    /**
+    * 实习参与人学号
+    */
+    @ApiModelProperty("实习参与人学号")
+    private String participantUserStudentId;
+    /**
+    * 实习参与人姓名
+    */
+    @ApiModelProperty("实习参与人姓名")
+    private String participantUserName;
+    /**
+    * 所属专业id(base_major)
+    */
+    @ApiModelProperty("所属专业id(base_major)")
+    private Long baseMajorId;
+    /**
+    * 所属专业名称
+    */
+    @ApiModelProperty("所属专业名称")
+    private String baseMajorName;
+    /**
+    * 班级id(base_class)
+    */
+    @ApiModelProperty("班级id(base_class)")
+    private Long classId;
+    /**
+    * 班级名称
+    */
+    @ApiModelProperty("班级名称")
+    private String className;
+    /**
+    * 带队老师(xjr_user)
+    */
+    @ApiModelProperty("带队老师(xjr_user)")
+    private Long teacherId;
+    /**
+    * 实习结果评价
+    */
+    @ApiModelProperty("实习结果评价")
+    private String result;
+
+}

src/main/java/com/xjrsoft/module/internship/vo/InternshipPlanManageParticipantVo.java

@@ -0,0 +1,78 @@
+package com.xjrsoft.module.internship.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+* @title: 实习计划参与人表表单出参
+* @Author dzx
+* @Date: 2025-06-26
+* @Version 1.0
+*/
+@Data
+public class InternshipPlanManageParticipantVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 实习计划id
+    */
+    @ApiModelProperty("实习计划id")
+    private Long internshipPlanManageId;
+    /**
+    * 实习参与人id
+    */
+    @ApiModelProperty("实习参与人id")
+    private Long participantUserId;
+    /**
+    * 实习参与人学号
+    */
+    @ApiModelProperty("实习参与人学号")
+    private String participantUserStudentId;
+    /**
+    * 实习参与人姓名
+    */
+    @ApiModelProperty("实习参与人姓名")
+    private String participantUserName;
+    /**
+    * 所属专业id(base_major)
+    */
+    @ApiModelProperty("所属专业id(base_major)")
+    private Long baseMajorId;
+    /**
+    * 所属专业名称
+    */
+    @ApiModelProperty("所属专业名称")
+    private String baseMajorName;
+    /**
+    * 班级id(base_class)
+    */
+    @ApiModelProperty("班级id(base_class)")
+    private Long classId;
+    /**
+    * 班级名称
+    */
+    @ApiModelProperty("班级名称")
+    private String className;
+    /**
+    * 带队老师(xjr_user)
+    */
+    @ApiModelProperty("带队老师(xjr_user)")
+    private Long teacherId;
+    /**
+    * 实习结果评价
+    */
+    @ApiModelProperty("实习结果评价")
+    private String result;
+
+
+
+}

src/main/java/com/xjrsoft/module/internship/vo/InternshipTeacherCollectEnrollExamPageVo.java

@@ -3,9 +3,6 @@ package com.xjrsoft.module.internship.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-
 /**
 * @title: 实习带队教师报名表分页列表出参
 * @Author dzx
@@ -30,4 +27,10 @@ public class InternshipTeacherCollectEnrollExamPageVo {
     @ApiModelProperty("是否通过")
     private Integer status;
 
+    @ApiModelProperty("在职状态")
+    private String jobStateCn;
+
+    @ApiModelProperty("聘用类型")
+    private String employTypeCn;
+
 }

src/main/java/com/xjrsoft/module/internship/vo/InternshipTeacherCollectEnrollListVo.java

@@ -0,0 +1,21 @@
+package com.xjrsoft.module.internship.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+* @title: 实习带队教师报名表分页列表出参
+* @Author dzx
+* @Date: 2025-06-25
+* @Version 1.0
+*/
+@Data
+public class InternshipTeacherCollectEnrollListVo {
+
+    @ApiModelProperty("主键编号")
+    private String id;
+
+    @ApiModelProperty("教师姓名")
+    private String name;
+
+}

src/main/java/com/xjrsoft/module/internship/vo/InternshipTeacherCollectVo.java

@@ -2,7 +2,8 @@ package com.xjrsoft.module.internship.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.joda.time.LocalDate;
+
+import java.time.LocalDate;
 
 /**
 * @title: 实习带队教师收集表表单出参

src/main/java/com/xjrsoft/module/veb/service/impl/ImportRubAndHandServiceImpl.java

@@ -9,15 +9,15 @@ import com.xjrsoft.common.enums.DeleteMark;
 import com.xjrsoft.module.base.entity.*;
 import com.xjrsoft.module.base.mapper.*;
 import com.xjrsoft.module.internship.entity.InternshipPlanManage;
+import com.xjrsoft.module.internship.entity.InternshipPlanManageParticipant;
 import com.xjrsoft.module.internship.mapper.InternshipPlanManageMapper;
+import com.xjrsoft.module.internship.mapper.InternshipPlanManageParticipantMapper;
 import com.xjrsoft.module.organization.entity.User;
 import com.xjrsoft.module.organization.mapper.UserMapper;
 import com.xjrsoft.module.system.mapper.DictionarydetailMapper;
 import com.xjrsoft.module.system.mapper.DictionaryitemMapper;
-import com.xjrsoft.module.veb.entity.InternshipPlanManageParticipant;
 import com.xjrsoft.module.veb.entity.TrainingOutside;
 import com.xjrsoft.module.veb.entity.TrainingSchool;
-import com.xjrsoft.module.veb.mapper.InternshipPlanManageParticipantMapper;
 import com.xjrsoft.module.veb.mapper.TrainingOutsideMapper;
 import com.xjrsoft.module.veb.mapper.TrainingSchoolMapper;
 import com.xjrsoft.module.veb.service.ImportRubAndHandService;
@@ -465,7 +465,7 @@ public class ImportRubAndHandServiceImpl implements ImportRubAndHandService {
             )) {
                 return sb.toString();
             }
-            internshipPlanManageParticipant.setCreateDate(new Date());
+            internshipPlanManageParticipant.setCreateDate(LocalDateTime.now());
             internshipPlanManageParticipant.setCreateUserId(StpUtil.getLoginIdAsLong());
             internshipPlanManageParticipants.add(internshipPlanManageParticipant);
         }

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xjrsoft.module.internship.mapper.InternshipPlanManageMapper">
+<mapper namespace="com.xjrsoft.module.internship.mapper.InternshipPlanTeacherMapper">
     <select id="getPage" parameterType="com.xjrsoft.module.internship.dto.InternshipPlanTeacherPageDto" resultType="com.xjrsoft.module.internship.vo.InternshipPlanTeacherPageVo">
         SELECT t1.id, t2.name,
         (
@@ -14,32 +14,17 @@
         INNER JOIN xjr_user t2 ON t1.user_id = t2.id
         WHERE t1.delete_mark = 0 AND t2.delete_mark = 0
         and t1.internship_plan_manage_id = #{dto.internshipPlanManageId}
-        <if test="dto.internshipPlanName != null and dto.internshipPlanName != ''">
-            and t1.internship_plan_name like concat('%', #{dto.internshipPlanName}, '%')
-        </if>
-        <if test="dto.internshipPlanType != null and dto.internshipPlanType != ''">
-            and t1.internship_plan_type = #{dto.internshipPlanType}
-        </if>
-        <if test="dto.internshipUnitSource != null and dto.internshipUnitSource != ''">
-            and t1.internship_unit_source = #{dto.internshipUnitSource}
-        </if>
-        <if test="dto.internshipSiteType != null and dto.internshipSiteType != ''">
-            and t1.internship_site_type = #{dto.internshipSiteType}
-        </if>
-        <if test="dto.internshipUnitName != null and dto.internshipUnitName != ''">
-            and t1.internship_unit_name like concat('%', #{dto.internshipUnitName}, '%')
-        </if>
-        <if test="dto.startTimeStart != null and dto.startTimeEnd != null">
-            and t1.start_time between #{dto.startTimeStart} and #{dto.startTimeEnd}
-        </if>
-        <if test="dto.endTimeStart != null and dto.endTimeEnd != null">
-            and t1.start_time between #{dto.endTimeStart} and #{dto.endTimeEnd}
-        </if>
-        <if test="dto.internshipWhereabouts != null and dto.internshipWhereabouts != ''">
-            and t1.internship_whereabouts like concat('%', #{dto.internshipWhereabouts}, '%')
-        </if>
-        <if test="dto.baseSemesterId != null">
-            and t1.base_semester_id = #{dto.baseSemesterId}
+        <if test="dto.name != null and dto.name != ''">
+            and t2.name like concat('%', #{dto.name}, '%')
+        </if>
+        <if test="dto.className != null and dto.className != ''">
+            and t1.id in (
+            SELECT GROUP_CONCAT(a1.name) FROM base_class a1
+            INNER JOIN internship_plan_class a2 ON a1.id = a2.class_id
+            WHERE a1.delete_mark = 0 AND a2.delete_mark = 0
+            AND a2.internship_plan_teacher_id = t1.id
+            and a2.name like concat('%', #{dto.className}, '%')
+            )
         </if>
     </select>
 </mapper>

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='学生自主实习申请表';
+
+
+
+
+

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

@@ -5203,4 +5203,29 @@ public class FreeMarkerGeneratorTest {
 
         apiGeneratorService.generateCodes(params);
     }
+
+    @Test
+    public void gcinternship_plan_manage_participant() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("internship_plan_manage_participant");//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);
+    }
 }