实习教师收集审核

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

@@ -26,6 +26,10 @@ import com.xjrsoft.module.internship.service.IInternshipTeacherCollectService;
 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.File;
+import com.xjrsoft.module.system.service.IFileService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -55,6 +59,8 @@ public class InternshipTeacherCollectEnrollController {
 
     private final IInternshipTeacherCollectService internshipTeacherCollectService;
     private final IInternshipTeacherCollectEnrollService internshipTeacherCollectEnrollService;
+    private final IUserService userService;
+    private final IFileService fileService;
 
     @GetMapping(value = "/page")
     @ApiOperation(value="实习带队教师报名表列表(分页)")
@@ -83,7 +89,19 @@ public class InternshipTeacherCollectEnrollController {
         if (internshipTeacherCollectEnroll == null) {
            return RT.error("找不到此数据！");
         }
-        return RT.ok(BeanUtil.toBean(internshipTeacherCollectEnroll, InternshipTeacherCollectEnrollVo.class));
+        InternshipTeacherCollectEnrollVo enrollVo = BeanUtil.toBean(internshipTeacherCollectEnroll, InternshipTeacherCollectEnrollVo.class);
+        User user = userService.getById(internshipTeacherCollectEnroll.getUserId());
+        if(user != null){
+            enrollVo.setName(user.getName());
+            enrollVo.setUserName(user.getUserName());
+            enrollVo.setMobile(user.getMobile());
+        }
+        if(internshipTeacherCollectEnroll.getFolderId() != null){
+            File file = fileService.getById(internshipTeacherCollectEnroll.getFolderId());
+            enrollVo.setFileUrl(file.getFileUrl());
+        }
+
+        return RT.ok(enrollVo);
     }
 
 

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

@@ -15,37 +15,19 @@ import java.time.LocalDateTime;
 @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;
-
 }

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

@@ -43,6 +43,18 @@ public class InternshipTeacherCollectEnrollVo {
     @ApiModelProperty("审核状态(null:未审核 0:未通过 1:通过)")
     private Integer status;
 
+    @ApiModelProperty("工号")
+    private String userName;
+
+    @ApiModelProperty("教师姓名")
+    private String name;
+
+    @ApiModelProperty("联系电话")
+    private String mobile;
+
+    @ApiModelProperty("附件地址")
+    private String fileUrl;
+
 
 
 }