公开招聘报名审核阶段接口

6a86c688 · jsy672 · cc2fb513 · 6a86c688 · 6a86c688 · 6a86c688
Commit 6a86c688 authored Apr 09, 2024 by jsy672
7 changed files
--- a/ruoyi-ui/src/views/smartSchool/openRecruitment/examManage/components/InfoReview.vue
+++ b/ruoyi-ui/src/views/smartSchool/openRecruitment/examManage/components/InfoReview.vue
@@ -326,25 +326,25 @@
 <script>
 import {
-  pass,
+  addRelation,
  back,
-  reject,
+  backOne,
  checkEnd,
  checkList,
-  getStudent,
-  delRelation,
-  addRelation,
-  updateRelation,
  commonUpload,
+  delRelation,
+  getPerInfo,
  getProjectList,
+  getStudent,
  listSchool,
-  getPerInfo,
+  pass,
+  passOne,
+  reject,
  rejectOne,
-  backOne,
+  updateRelation
-  passOne
 } from "@/api/smartSchool/openRecruitment";
 import {getToken} from "@/utils/auth";
-import {Gender, Nations} from "@/enums/common";
+import {Gender} from "@/enums/common";
 export default {
  name: "Relation",
@@ -444,7 +444,7 @@ export default {
        // 设置上传的请求头部
        headers: {Authorization: "Bearer " + getToken()},
        // 上传的地址
-        url: process.env.VUE_APP_BASE_API + `/eduArtStudent/importData/${this.examId}`,
+        url: process.env.VUE_APP_BASE_API + `/edu-recruit-student/importData/${this.examId}`,
      },
      // 表单参数
      form: {
@@ -814,14 +814,14 @@ export default {
    },
    /** 导出按钮操作 */
    handleExport() {
-      this.download(`/artStudent/export/${this.examId}`, {
+      this.download(`/recruitStudent/export/${this.examId}`, {
        ...this.queryParams
      }, `报名信息${Date.now()}.xlsx`)
    },
    // 下载模板
    importTemplate() {
      this.download(
-        "/eduArtStudent/importTemplate",
+          "/edu-recruit-student/importTemplate",
        {},
        `导入教育局信息内模板_${Date.now()}.xlsx`
      );

--- a/smart-campus/src/main/java/yangtz/cs/liu/campus/controller/A.java
+++ b/smart-campus/src/main/java/yangtz/cs/liu/campus/controller/A.java
 package yangtz.cs.liu.campus.controller;
 import com.core.utils.HolidayDateUtil;
-import com.core.utils.StringUtil;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.StringUtils;
-import lombok.Data;
-import sun.security.provider.Sun;
-import yangtz.cs.liu.campus.domain.student.SchoolStudent;
-import yangtz.cs.liu.campus.vo.student.StudentLeaveVO;
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
+import java.util.ArrayList;
-import java.util.*;
+import java.util.Calendar;
-import java.util.stream.Collectors;
+import java.util.Date;
-import java.util.stream.Stream;
+import java.util.List;
+import lombok.Data;
 @Data
 public class A {

--- a/smart-campus/src/main/java/yangtz/cs/liu/campus/controller/examination/SchoolRecruitExamController.java
+++ b/smart-campus/src/main/java/yangtz/cs/liu/campus/controller/examination/SchoolRecruitExamController.java
@@ -8,29 +8,36 @@ import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
 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.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+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 org.springframework.web.multipart.MultipartFile;
 import yangtz.cs.liu.campus.constant.RecruitExamConstant;
 import yangtz.cs.liu.campus.domain.recruit.EduRecruitStudent;
 import yangtz.cs.liu.campus.domain.recruit.SchoolRecruitExam;
 import yangtz.cs.liu.campus.domain.recruit.SchoolRecruitProject;
 import yangtz.cs.liu.campus.domain.recruit.SchoolRecruitRelation;
-import yangtz.cs.liu.campus.service.recruit.*;
+import yangtz.cs.liu.campus.service.recruit.IEduRecruitStudentService;
+import yangtz.cs.liu.campus.service.recruit.ISchoolRecruitExamService;
+import yangtz.cs.liu.campus.service.recruit.ISchoolRecruitProjectService;
+import yangtz.cs.liu.campus.service.recruit.ISchoolRecruitRelationService;
+import yangtz.cs.liu.campus.service.recruit.ISchoolRecruitStudentService;
 import yangtz.cs.liu.campus.vo.recruit.RecruitEduStudentVo;
 import yangtz.cs.liu.campus.vo.recruit.RecruitExamAddressVo;
 import yangtz.cs.liu.campus.vo.recruit.RecruitExamScoreVo;
 import yangtz.cs.liu.campus.vo.recruit.SchoolRecruitExamVo;
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
 /**
 * @author xuten
 */
@@ -180,14 +187,6 @@ public class SchoolRecruitExamController extends BaseController {
    }
    /**
-     * 考试管理-信息审核-单个详情
-     */
-    @GetMapping("/get-check-detail/{id}")
-    public AjaxResult getCheckDetail(@PathVariable Long checkId) {
-        return AjaxResult.success(recruitStudentService.getInfo(checkId));
-    }
-    /**
     * 考试管理-信息审核-通过
     * 所有信息都匹配才能将审核状态改为通过
     */

--- a/smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/recruit/SchoolRecruitStudentServiceImpl.java
+++ b/smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/recruit/SchoolRecruitStudentServiceImpl.java
 package yangtz.cs.liu.campus.service.impl.recruit;
+import static com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isNotNull;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.constant.Constants;
@@ -12,31 +14,42 @@ import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.framework.manager.AsyncManager;
 import com.ruoyi.framework.manager.factory.AsyncFactory;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import yangtz.cs.liu.campus.constant.RecruitExamConstant;
 import yangtz.cs.liu.campus.domain.examination.JuniorHighSchool;
-import yangtz.cs.liu.campus.domain.recruit.*;
+import yangtz.cs.liu.campus.domain.recruit.EduRecruitStudent;
+import yangtz.cs.liu.campus.domain.recruit.SchoolRecruitExam;
+import yangtz.cs.liu.campus.domain.recruit.SchoolRecruitProject;
+import yangtz.cs.liu.campus.domain.recruit.SchoolRecruitRelation;
+import yangtz.cs.liu.campus.domain.recruit.SchoolRecruitStudent;
+import yangtz.cs.liu.campus.domain.recruit.SchoolRecruitStudentFamily;
+import yangtz.cs.liu.campus.domain.recruit.SchoolRecruitStudentFjb;
+import yangtz.cs.liu.campus.domain.recruit.SchoolRecruitStudentJl;
 import yangtz.cs.liu.campus.mapper.examination.JuniorHighSchoolMapper;
-import yangtz.cs.liu.campus.mapper.recruit.*;
+import yangtz.cs.liu.campus.mapper.recruit.EduRecruitStudentMapper;
+import yangtz.cs.liu.campus.mapper.recruit.SchoolRecruitExamMapper;
+import yangtz.cs.liu.campus.mapper.recruit.SchoolRecruitProjectMapper;
+import yangtz.cs.liu.campus.mapper.recruit.SchoolRecruitRelationMapper;
+import yangtz.cs.liu.campus.mapper.recruit.SchoolRecruitStudentFamilyMapper;
+import yangtz.cs.liu.campus.mapper.recruit.SchoolRecruitStudentFjbMapper;
+import yangtz.cs.liu.campus.mapper.recruit.SchoolRecruitStudentJlMapper;
+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.webpage.domain.WebRegisterBody;
-import yangtz.cs.liu.webpage.vo.RecruitAdmissionTicketVo;
 import yangtz.cs.liu.webpage.vo.QueryScoreVo;
+import yangtz.cs.liu.webpage.vo.RecruitAdmissionTicketVo;
 import yangtz.cs.liu.webpage.vo.WebSchoolRecruitStudentVo;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-import static com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isNotNull;
 @Service
 public class SchoolRecruitStudentServiceImpl extends ServiceImpl<SchoolRecruitStudentMapper, SchoolRecruitStudent> implements ISchoolRecruitStudentService {
    @Autowired
@@ -548,8 +561,8 @@ public class SchoolRecruitStudentServiceImpl extends ServiceImpl<SchoolRecruitSt
                        //设置结果集对应教育局信息
                        studentVo.setEduIdCard(eduRecruitStudent.getEduIdCard());
                        studentVo.setEduStudentName(eduRecruitStudent.getEduStudentName());
-                        studentVo.setEduStudentNumber(eduRecruitStudent.getEduStudentNumber());
+//                        studentVo.setEduStudentNumber(eduRecruitStudent.getEduStudentNumber());
-                        studentVo.setEduSchoolName(eduRecruitStudent.getEduSchoolName());
+//                        studentVo.setEduSchoolName(eduRecruitStudent.getEduSchoolName());
                        studentVo.setEduProject(eduRecruitStudent.getEduProject());
                        studentVo.setEduSex(eduRecruitStudent.getEduSex());
                        break;
@@ -562,8 +575,8 @@ public class SchoolRecruitStudentServiceImpl extends ServiceImpl<SchoolRecruitSt
                    studentVo.setInfoIdCard(eduRecruitStudent.getEduIdCard());
                    studentVo.setEduIdCard(eduRecruitStudent.getEduIdCard());
                    studentVo.setEduStudentName(eduRecruitStudent.getEduStudentName());
-                    studentVo.setEduStudentNumber(eduRecruitStudent.getEduStudentNumber());
+//                    studentVo.setEduStudentNumber(eduRecruitStudent.getEduStudentNumber());
-                    studentVo.setEduSchoolName(eduRecruitStudent.getEduSchoolName());
+//                    studentVo.setEduSchoolName(eduRecruitStudent.getEduSchoolName());
                    studentVo.setEduProject(eduRecruitStudent.getEduProject());
                    studentVo.setEduSex(eduRecruitStudent.getEduSex());
                    voList.add(studentVo);
@@ -707,12 +720,12 @@ public class SchoolRecruitStudentServiceImpl extends ServiceImpl<SchoolRecruitSt
                if (!student.getStudentName().equals(eduRecruitStudent.getEduStudentName())) {
                    flag = false;
                }
-                if (!student.getStudentNumber().equals(eduRecruitStudent.getEduStudentNumber())) {
+//                if (!student.getStudentNumber().equals(eduRecruitStudent.getEduStudentNumber())) {
-                    flag = false;
+//                    flag = false;
-                }
+//                }
-                if (!student.getSchoolName().equals(eduRecruitStudent.getEduSchoolName())) {
+//                if (!student.getSchoolName().equals(eduRecruitStudent.getEduSchoolName())) {
-                    flag = false;
+//                    flag = false;
-                }
+//                }
                if (!student.getProject().equals(eduRecruitStudent.getEduProject())) {
                    flag = false;
                }
@@ -772,12 +785,12 @@ public class SchoolRecruitStudentServiceImpl extends ServiceImpl<SchoolRecruitSt
            if (!vo.getStudentName().equals(eduRecruitStudent.getEduStudentName())) {
                flag = false;
            }
-            if (!vo.getStudentNumber().equals(eduRecruitStudent.getEduStudentNumber())) {
+//            if (!vo.getStudentNumber().equals(eduRecruitStudent.getEduStudentNumber())) {
-                flag = false;
+//                flag = false;
-            }
+//            }
-            if (!vo.getSchoolName().equals(eduRecruitStudent.getEduSchoolName())) {
+//            if (!vo.getSchoolName().equals(eduRecruitStudent.getEduSchoolName())) {
-                flag = false;
+//                flag = false;
-            }
+//            }
            if (!vo.getProject().equals(eduRecruitStudent.getEduProject())) {
                flag = false;
            }
@@ -959,18 +972,18 @@ public class SchoolRecruitStudentServiceImpl extends ServiceImpl<SchoolRecruitSt
                    if (!vo.getStudentName().equals(vo.getEduStudentName())) {
                        flag = false;
                    }
-                    if (!vo.getStudentNumber().equals(vo.getEduStudentNumber())) {
+//                    if (!vo.getStudentNumber().equals(vo.getEduStudentNumber())) {
-                        flag = false;
+//                        flag = false;
-                    }
+//                    }
-                    if (!vo.getSchoolName().equals(vo.getEduSchoolName())) {
+//                    if (!vo.getSchoolName().equals(vo.getEduSchoolName())) {
-                        flag = false;
+//                        flag = false;
-                    }
+//                    }
                    if (!vo.getProject().equals(vo.getEduProject())) {
                        flag = false;
                    }
-                    if (!vo.getSex().equals(vo.getEduSex())) {
+//                    if (!vo.getSex().equals(vo.getEduSex())) {
-                        flag = false;
+//                        flag = false;
-                    }
+//                    }
                    if (flag) {
                        //全部都匹配
                        vo.setMatchStatus(RecruitExamConstant.PASS);

--- a/smart-campus/src/main/java/yangtz/cs/liu/campus/vo/recruit/RecruitEduStudentVo.java
+++ b/smart-campus/src/main/java/yangtz/cs/liu/campus/vo/recruit/RecruitEduStudentVo.java
+package yangtz.cs.liu.campus.vo.recruit;
+import com.core.domain.OurBaseEntity;
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+@Data
+public class RecruitEduStudentVo extends OurBaseEntity {
+  /**
+   * 考试id
+   */
+  @Excel(name = "考试id")
+  private Long examId;
+  /**
+   * 学生id
+   */
+  @Excel(name = "学生id")
+  private Long studentId;
+  /**
+   * 审核状态（只存在教育局信息时该字段没有值，0=驳回，1=通过，2 =退回修改,3=待审核）
+   */
+  @Excel(name = "审核状态", readConverterExp = "只=存在教育局信息时该字段没有值，0=驳回，1=通过，2,==退回修改,3=待审核")
+  private String auditStatus;
+  /**
+   * 匹配状态（0=不匹配，1= 匹配，2=无教育局信息，3=未报名）
+   */
+  @Excel(name = "匹配状态", readConverterExp = "0=不匹配，1=匹配，2=无教育局信息，3=未报名")
+  private String matchStatus;
+  /**
+   * 身份证号码
+   */
+  @Excel(name = "身份证号码")
+  private String infoIdCard;
+  /***********学生自己的报名信息***********/
+  /**
+   * 姓名
+   */
+  @Excel(name = "姓名")
+  private String studentName;
+  /**
+   * 身份证号
+   */
+  @Excel(name = "身份证号")
+  private String idCard;
+  /**
+   * 学籍号
+   */
+  @Excel(name = "学籍号")
+  private String studentNumber;
+  /**
+   * 初中学校id
+   */
+  @Excel(name = "初中学校id")
+  private Long juniorId;
+  private String schoolName;
+  /**
+   * 测试项目id
+   */
+  @Excel(name = "测试项目id")
+  private Long testId;
+  private String project;
+  /**
+   * 性别（0=男，1=女）
+   */
+  @Excel(name = "性别", readConverterExp = "0==男，1=女")
+  private String sex;
+  /**
+   * 照片
+   */
+  @Excel(name = "照片")
+  private String photo;
+  /***************教育局信息***************/
+  /**
+   * 身份证号
+   */
+  @Excel(name = "身份证号")
+  private String eduIdCard;
+  /**
+   * 姓名
+   */
+  @Excel(name = "姓名")
+  private String eduStudentName;
+  /** 学籍号 */
+//    @Excel(name = "学籍号")
+//    private String eduStudentNumber;
+  /** 初中学校id */
+//    @Excel(name = "初中学校id")
+//    private Long eduJuniorId;
+  /** 初中学校 */
+//    @Excel(name = "初中学校")
+//    private String eduSchoolName;
+  /**
+   * 测试项目id
+   */
+  @Excel(name = "测试项目id")
+  private Long eduTestId;
+  /**
+   * 测试项目
+   */
+  @Excel(name = "测试项目")
+  private String eduProject;
+  /**
+   * 性别（0=男，1=女）
+   */
+  @Excel(name = "性别", readConverterExp = "0=男，1=女")
+  private String eduSex;
+}
--- a/smart-campus/src/main/java/yangtz/cs/liu/campus/vo/recruit/SchoolRecruitStudentVo.java
+++ b/smart-campus/src/main/java/yangtz/cs/liu/campus/vo/recruit/SchoolRecruitStudentVo.java
@@ -22,12 +22,12 @@ public class SchoolRecruitStudentVo extends OurBaseEntity {
    private String studentName;
    /** 学籍号 */
-    @Excel(name = "学籍号",width = 30)
+//    @Excel(name = "学籍号",width = 30)
    private String studentNumber;
    /** 初中学校id */
    private Long juniorId;
-    @Excel(name = "初中学校",width = 30)
+    //    @Excel(name = "初中学校",width = 30)
    private String schoolName;
    /** 测试项目id */
@@ -40,11 +40,11 @@ public class SchoolRecruitStudentVo extends OurBaseEntity {
    private String sex;
    /** 身高（单位厘米） */
-    @Excel(name = "身高")
+//    @Excel(name = "身高")
    private double height;
    /** 体重（单位千克） */
-    @Excel(name = "体重")
+//    @Excel(name = "体重")
    private double weight;
    /** 联系方式1 */

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