公开招聘报名导出信息增加审批状态字段

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/examination/SchoolRecruitStudentController.java

@@ -7,21 +7,23 @@ import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+import javax.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+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.RestController;
 import yangtz.cs.liu.campus.domain.recruit.SchoolRecruitStudent;
 import yangtz.cs.liu.campus.service.recruit.ISchoolRecruitStudentService;
-
 import yangtz.cs.liu.campus.vo.recruit.RecruitAndEduStudentVo;
 import yangtz.cs.liu.campus.vo.recruit.RecruitEduStudentVo;
-import yangtz.cs.liu.campus.vo.recruit.SchoolRecruitStudentVo;
-
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
+import yangtz.cs.liu.campus.vo.recruit.SchoolRecruitStudentExportVo;
 
 /**
  * @author xuten
@@ -73,8 +75,9 @@ public class SchoolRecruitStudentController extends BaseController {
      * */
     @PostMapping("/export/{examId}")
     public void export(HttpServletResponse response, RecruitEduStudentVo vo, @PathVariable Long examId) {
-        List<SchoolRecruitStudentVo> list = new ArrayList<>();
-        ExcelUtil<SchoolRecruitStudentVo> util = new ExcelUtil<>(SchoolRecruitStudentVo.class);
+        List<SchoolRecruitStudentExportVo> list = new ArrayList<>();
+        ExcelUtil<SchoolRecruitStudentExportVo> util = new ExcelUtil<>(
+            SchoolRecruitStudentExportVo.class);
         vo.setExamId(examId);
         List<RecruitEduStudentVo> voList = recruitStudentService.getInfoCheck(vo);
         //获取所有studentId

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/recruit/SchoolRecruitStudentMapper.java

 package yangtz.cs.liu.campus.mapper.recruit;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import yangtz.cs.liu.campus.domain.recruit.SchoolRecruitStudent;
-import yangtz.cs.liu.campus.vo.recruit.SchoolRecruitStudentVo;
+import yangtz.cs.liu.campus.vo.recruit.SchoolRecruitStudentExportVo;
 import yangtz.cs.liu.webpage.vo.WebSchoolRecruitStudentVo;
 
-import java.util.List;
-
 /**
  * @author xuten
  */
@@ -41,6 +40,6 @@ public interface SchoolRecruitStudentMapper extends BaseMapper<SchoolRecruitStud
                                      @Param("examId") Long examId);
 
     /** 教务管理-考试管理-信息审核-导出报名信息  */
-    List<SchoolRecruitStudentVo> editExport(@Param("idList") List<Long> idList,
+    List<SchoolRecruitStudentExportVo> editExport(@Param("idList") List<Long> idList,
                                         @Param("examId") Long examId);
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/recruit/SchoolRecruitStudentServiceImpl.java

@@ -44,7 +44,7 @@ import yangtz.cs.liu.campus.mapper.recruit.SchoolRecruitStudentMapper;
 import yangtz.cs.liu.campus.service.recruit.ISchoolRecruitStudentService;
 import yangtz.cs.liu.campus.vo.recruit.RecruitAndEduStudentVo;
 import yangtz.cs.liu.campus.vo.recruit.RecruitEduStudentVo;
-import yangtz.cs.liu.campus.vo.recruit.SchoolRecruitStudentVo;
+import yangtz.cs.liu.campus.vo.recruit.SchoolRecruitStudentExportVo;
 import yangtz.cs.liu.webpage.domain.WebRegisterBody;
 import yangtz.cs.liu.webpage.vo.QueryScoreVo;
 import yangtz.cs.liu.webpage.vo.RecruitAdmissionTicketVo;
@@ -687,11 +687,11 @@ public class SchoolRecruitStudentServiceImpl extends
    * 教务管理-考试管理-信息审核-导出报名信息
    */
   @Override
-  public List<SchoolRecruitStudentVo> editExport(List<Long> idList, Long examId) {
-    List<SchoolRecruitStudentVo> list = recruitStudentMapper.editExport(idList, examId);
+  public List<SchoolRecruitStudentExportVo> editExport(List<Long> idList, Long examId) {
+    List<SchoolRecruitStudentExportVo> list = recruitStudentMapper.editExport(idList, examId);
     //序号
     int i = 1;
-    for (SchoolRecruitStudentVo student : list) {
+    for (SchoolRecruitStudentExportVo student : list) {
       student.setXh(i);
       i++;
     }
@@ -709,10 +709,10 @@ public class SchoolRecruitStudentServiceImpl extends
     int failureNum = 0;
     StringBuilder successMsg = new StringBuilder();
     //查询出所有studentIds对应的学生信息
-    List<SchoolRecruitStudentVo> list = recruitStudentMapper.editExport(studentIds, examId);
+    List<SchoolRecruitStudentExportVo> list = recruitStudentMapper.editExport(studentIds, examId);
     //选中的有效学生信息总数
     int allNum = list.size();
-    for (SchoolRecruitStudentVo student : list) {
+    for (SchoolRecruitStudentExportVo student : list) {
       //根据考试id，和学生身份证号查出教育局学生信息进行比对
       EduRecruitStudent eduRecruitStudent = eduRecruitStudentMapper.getStudent(examId,
           student.getIdCard());

smart-campus/src/main/java/yangtz/cs/liu/campus/service/recruit/ISchoolRecruitStudentService.java

@@ -6,7 +6,7 @@ import java.util.List;
 import yangtz.cs.liu.campus.domain.recruit.SchoolRecruitStudent;
 import yangtz.cs.liu.campus.vo.recruit.RecruitAndEduStudentVo;
 import yangtz.cs.liu.campus.vo.recruit.RecruitEduStudentVo;
-import yangtz.cs.liu.campus.vo.recruit.SchoolRecruitStudentVo;
+import yangtz.cs.liu.campus.vo.recruit.SchoolRecruitStudentExportVo;
 import yangtz.cs.liu.webpage.domain.WebRegisterBody;
 import yangtz.cs.liu.webpage.vo.QueryScoreVo;
 import yangtz.cs.liu.webpage.vo.RecruitAdmissionTicketVo;
@@ -62,7 +62,7 @@ public interface ISchoolRecruitStudentService extends IService<SchoolRecruitStud
     int edit(Long examId, WebSchoolRecruitStudentVo student);
 
     /** 教务管理-考试管理-信息审核-导出报名信息  */
-    List<SchoolRecruitStudentVo> editExport(List<Long> idList, Long examId);
+    List<SchoolRecruitStudentExportVo> editExport(List<Long> idList, Long examId);
 
     /** 教务管理-考试管理-通过 */
     String pass(Long examId, List<Long> studentIds);

smart-campus/src/main/java/yangtz/cs/liu/campus/vo/recruit/SchoolRecruitStudentExportVo.java

+package yangtz.cs.liu.campus.vo.recruit;
+
+import com.core.domain.OurBaseEntity;
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+
+/**
+ * @author xuten
+ */
+@Data
+public class SchoolRecruitStudentExportVo extends OurBaseEntity {
+
+  /**
+   * 序号
+   */
+  @Excel(name = "序号")
+  private int xh;
+
+  /**
+   * 身份证号
+   */
+  @Excel(name = "身份证号", width = 30)
+  private String idCard;
+
+  /**
+   * 姓名
+   */
+  @Excel(name = "姓名")
+  private String studentName;
+
+  /**
+   * 学籍号
+   */
+//    @Excel(name = "学籍号",width = 30)
+  private String studentNumber;
+
+  /**
+   * 初中学校id
+   */
+  private Long juniorId;
+  //    @Excel(name = "初中学校",width = 30)
+  private String schoolName;
+
+  /**
+   * 测试项目id
+   */
+  private Long testId;
+  @Excel(name = "测试项目")
+  private String project;
+
+  /**
+   * 性别（0=男，1=女）
+   */
+  @Excel(name = "性别", readConverterExp = "0=男,1=女")
+  private String sex;
+
+  /**
+   * 身高（单位厘米）
+   */
+//    @Excel(name = "身高")
+  private double height;
+
+  /**
+   * 体重（单位千克）
+   */
+//    @Excel(name = "体重")
+  private double weight;
+
+  /**
+   * 联系方式1
+   */
+  @Excel(name = "联系方式1")
+  private String telephone1;
+
+  /**
+   * 联系方式2
+   */
+  @Excel(name = "联系方式2")
+  private String telephone2;
+
+  @Excel(name = "审核状态", readConverterExp = "0=驳回,1=通过,2=退回修改,3=待审核")
+  private String auditStatus;
+}

smart-campus/src/main/resources/mapper/recruit/SchoolRecruitStudentMapper.xml

@@ -109,10 +109,10 @@
       and sar.del_flag = '0'
       and sas.id = #{id}
   </select>
-  <select id="editExport" resultType="yangtz.cs.liu.campus.vo.recruit.SchoolRecruitStudentVo">
+  <select id="editExport" resultType="yangtz.cs.liu.campus.vo.recruit.SchoolRecruitStudentExportVo">
     select sas.id, sas.student_name, sas.id_card, sas.student_number, sar.junior_id,
     jhs.school_name, sar.test_id, stp.project, sas.sex, sas.height, sas.weight, sas.telephone1,
-    sas.telephone2,
+    sas.telephone2,sar.audit_status,
     sas.photo from school_recruit_student sas
     left join school_recruit_relation sar on sar.student_id = sas.id
     left join junior_high_school jhs on jhs.id = sar.junior_id