实习教师收集

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

@@ -13,12 +13,17 @@ 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.AddInternshipTeacherCollectDto;
+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;
+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.InternshipTeacherCollectPageVo;
 import com.xjrsoft.module.internship.vo.InternshipTeacherCollectVo;
+import com.xjrsoft.module.organization.entity.User;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -48,6 +53,7 @@ public class InternshipTeacherCollectController {
 
 
     private final IInternshipTeacherCollectService internshipTeacherCollectService;
+    private final IInternshipTeacherCollectEnrollService internshipTeacherCollectEnrollService;
 
     @GetMapping(value = "/page")
     @ApiOperation(value="实习带队教师收集表列表(分页)")
@@ -58,6 +64,7 @@ public class InternshipTeacherCollectController {
         MPJLambdaWrapper<InternshipTeacherCollect> queryWrapper = new MPJLambdaWrapper<>();
         queryWrapper
                 .select(InternshipTeacherCollect.class,x -> VoToColumnUtil.fieldsToColumns(InternshipTeacherCollectPageVo.class).contains(x.getProperty()))
+                .select(InternshipTeacherCollect::getId)
                 .selectAs(BaseSemester::getName, InternshipTeacherCollectPageVo::getBaseSemesterName)
                 .innerJoin(BaseSemester.class, BaseSemester::getId, InternshipTeacherCollect::getBaseSemesterId)
                 .like(StrUtil.isNotEmpty(dto.getName()), InternshipTeacherCollect::getName, dto.getName())
@@ -111,4 +118,22 @@ public class InternshipTeacherCollectController {
 
     }
 
+    @GetMapping(value = "/enroll-page")
+    @ApiOperation(value="实习带队教师报名表审核列表(分页)")
+    @SaCheckPermission("internshipteachercollectenroll:detail")
+    @XjrLog(value = "实习带队教师报名表审核列表(分页)")
+    public RT<PageOutput<InternshipTeacherCollectEnrollExamPageVo>> page(@Valid InternshipTeacherCollectEnrollPageDto dto){
+
+        MPJLambdaWrapper<InternshipTeacherCollectEnroll> queryWrapper = new MPJLambdaWrapper<>();
+        queryWrapper
+                .select(InternshipTeacherCollectEnroll::getId)
+                .select(User::getName)
+                .select(User::getMobile)
+                .select(User::getUserName)
+                .innerJoin(User.class, User::getId, InternshipTeacherCollectEnroll::getUserId)
+                .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);
+    }
 }

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

@@ -14,8 +14,11 @@ 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;
@@ -127,7 +130,19 @@ public class InternshipTeacherCollectEnrollController {
     @XjrLog(value = "删除实习带队教师报名表")
     public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
         return RT.ok(internshipTeacherCollectEnrollService.removeBatchByIds(ids));
+    }
 
+    @PostMapping(value = "/change-status")
+    @ApiOperation(value = "修改状态")
+    @SaCheckPermission("officebuild:detail")
+    @XjrLog(value = "修改状态", saveResponseData = true)
+    public RT<Boolean> changeStatus(@Valid @RequestBody InternshipTeacherCollectEnrollStatusDto dto) throws Exception {
+        for (Long id : dto.getIds()) {
+            InternshipTeacherCollectEnroll teacherCollectEnroll = internshipTeacherCollectEnrollService.getById(id);
+            teacherCollectEnroll.setStatus(dto.getStatus());
+            internshipTeacherCollectEnrollService.updateById(teacherCollectEnroll);
+        }
+        return RT.ok(true);
     }
 
 }

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

@@ -0,0 +1,25 @@
+package com.xjrsoft.module.internship.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+* @title: 实习计划管理状态
+* @Author dzx
+* @Date: 2025-06-23
+* @Version 1.0
+*/
+@Data
+public class InternshipTeacherCollectEnrollStatusDto implements Serializable {
+
+    @ApiModelProperty("主键编号")
+    private List<Long> ids;
+
+
+    @ApiModelProperty("状态（0:未通过 1:通过）")
+    private Integer status;
+}

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

@@ -0,0 +1,51 @@
+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
+* @Date: 2025-06-25
+* @Version 1.0
+*/
+@Data
+public class InternshipTeacherCollectEnrollExamPageVo {
+
+    /**
+     * 主键编号
+     */
+    @ApiModelProperty("主键编号")
+    private String id;
+
+    @ApiModelProperty("工号")
+    private String userName;
+
+    /**
+     * 名称
+     */
+    @ApiModelProperty("教师姓名")
+    private String name;
+    /**
+     * 开始日期
+     */
+    @ApiModelProperty("联系电话")
+    private String mobile;
+    /**
+     * 结束日期
+     */
+    @ApiModelProperty("结束日期")
+    private LocalDate endDate;
+    /**
+     * 状态(0:草稿 1:收集中 2:已结束)
+     */
+    @ApiModelProperty("是否通过")
+    private Integer status;
+
+    @ApiModelProperty("报名人数")
+    private Integer enrollCount;
+
+}