Skip to content

D
dd_school
Commit 4bacc8a1 by jsy672
Options

修改公开招聘审核列表查询接口

parent d8907953
Showing with 138 additions and 131 deletions
ruoyi-admin/src/main/resources/application.yml
......@@ -9,13 +9,14 @@ ruoyi:
# 实例演示开关
demoEnabled: true
# 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
profile: D:/ruoyi/uploadPath
profile: E:/repo-git/shenglierzhong/dd_school/uploadPath
# profile: /home/ruoyi/uploadPath
#指定上传文件到哪个服务器,读取文件(本地选localhost，测试选47.105.176.202,试运行选10.20.100.201)
# serverAddress: http://47.105.176.202:5112
# serverAddress: http://47.105.176.202:5131
serverAddress: http://192.168.31.166:5131
# serverAddress: http://192.168.31.166:5131
# serverAddress: http://10.20.100.201:57321
serverAddress: http://localhost:5131
# 获取ip地址开关
addressEnabled: false
# 验证码类型 math 数组计算 char 字符验证
......
ruoyi-admin/src/test/java/com/ruoyi/test/RuoyiTest.java 0 → 100644
package com.ruoyi.test;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
public class RuoyiTest {
public static void main(String[] args) {
String password = "1111@aaaa";
String encode = new BCryptPasswordEncoder().encode(password);
System.out.println(encode);
}
}
ruoyi-common/src/main/java/com/ruoyi/common/utils/pdf/PDFUtil.java
......@@ -5,7 +5,6 @@ import com.itextpdf.text.pdf.BaseFont;
import com.itextpdf.text.pdf.PdfPCell;
import com.itextpdf.text.pdf.PdfPTable;
import com.itextpdf.text.pdf.PdfWriter;
import javafx.scene.paint.Color;
import javax.servlet.http.HttpServletResponse;
import java.io.ByteArrayOutputStream;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/examination/EduRecruitStudentController.java 0 → 100644
package yangtz.cs.liu.campus.controller.examination;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.poi.ExcelUtil;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
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.service.examination.IEduArtStudentService;
import yangtz.cs.liu.campus.service.recruit.IEduRecruitStudentService;
import yangtz.cs.liu.campus.vo.examination.EduCruitStudentExportVo;
import yangtz.cs.liu.campus.vo.examination.EduExportVo;
/**
* @author xuten
*/
@RestController
@RequestMapping("/edu-recruit-student")
public class EduRecruitStudentController extends BaseController {
@Autowired
private IEduArtStudentService eduArtStudentService;
@Autowired
private IEduRecruitStudentService eduRecruitStudentService;
/**
* 教育局艺考生信息导入模板下载
* */
@PostMapping("/importTemplate")
public void importTemplate(HttpServletResponse response) {
ExcelUtil<EduCruitStudentExportVo> util = new ExcelUtil<EduCruitStudentExportVo>(EduCruitStudentExportVo.class);
util.importTemplateExcel(response, "导入信息模板");
}
/**
* 教育局艺考生信息导入
* */
@PostMapping("/importData/{examId}")
public AjaxResult importDate(@PathVariable Long examId, MultipartFile file) throws Exception {
ExcelUtil<EduCruitStudentExportVo> util = new ExcelUtil<>(EduCruitStudentExportVo.class);
List<EduCruitStudentExportVo> list = util.importExcel(file.getInputStream());
//校验数据
eduRecruitStudentService.checkImport(list);
//数据导入
return AjaxResult.success(eduRecruitStudentService.importData(list,examId));
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/examination/SchoolRecruitExamController.java
......@@ -180,6 +180,14 @@ public class SchoolRecruitExamController extends BaseController {
}
/**
* 考试管理-信息审核-单个详情
*/
@GetMapping("/get-check-detail/{id}")
public AjaxResult getCheckDetail(@PathVariable Long checkId) {
return AjaxResult.success(recruitStudentService.getInfo(checkId));
}
/**
* 考试管理-信息审核-通过
* 所有信息都匹配才能将审核状态改为通过
*/
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/recruit/EduRecruitStudentServiceImpl.java
......@@ -15,6 +15,7 @@ import yangtz.cs.liu.campus.mapper.examination.JuniorHighSchoolMapper;
import yangtz.cs.liu.campus.mapper.recruit.EduRecruitStudentMapper;
import yangtz.cs.liu.campus.mapper.recruit.SchoolRecruitProjectMapper;
import yangtz.cs.liu.campus.service.recruit.IEduRecruitStudentService;
import yangtz.cs.liu.campus.vo.examination.EduCruitStudentExportVo;
import yangtz.cs.liu.campus.vo.recruit.RecruitEduExportVo;
import java.util.List;
......@@ -31,7 +32,7 @@ public class EduRecruitStudentServiceImpl extends ServiceImpl<EduRecruitStudentM
private JuniorHighSchoolMapper schoolMapper;
@Override
public void checkImport(List<RecruitEduExportVo> list) {
public void checkImport(List<EduCruitStudentExportVo> list) {
//检验是否为空
if(StringUtils.isNull(list) || list.size() == 0){
throw new ServiceException("导入数据不能为空");
......@@ -40,7 +41,7 @@ public class EduRecruitStudentServiceImpl extends ServiceImpl<EduRecruitStudentM
// 准备记录日志数据
int failureNum = 0;
StringBuilder failureMsg = new StringBuilder();
for(RecruitEduExportVo vo : list){
for(EduCruitStudentExportVo vo : list){
if (StringUtils.isEmpty(vo.getEduIdCard())) {
failureNum++;
failureMsg.append("<br/>" + failureNum + "、身份证号为空,请您重新输入! ");
......@@ -49,14 +50,6 @@ public class EduRecruitStudentServiceImpl extends ServiceImpl<EduRecruitStudentM
failureNum++;
failureMsg.append("<br/>" + failureNum + "、姓名为空,请您重新输入! ");
}
if (StringUtils.isEmpty(vo.getEduStudentNumber())) {
failureNum++;
failureMsg.append("<br/>" + failureNum + "、学籍号为空,请您重新输入! ");
}
if (StringUtils.isEmpty(vo.getEduSchoolName())) {
failureNum++;
failureMsg.append("<br/>" + failureNum + "、初中学校为空,请您重新输入! ");
}
if (StringUtils.isEmpty(vo.getEduProject())) {
failureNum++;
failureMsg.append("<br/>" + failureNum + "、测试项目为空,请您重新输入! ");
......@@ -75,13 +68,13 @@ public class EduRecruitStudentServiceImpl extends ServiceImpl<EduRecruitStudentM
//数据导入
@Override
@Transactional(rollbackFor = Exception.class)
public String importData(List<RecruitEduExportVo> list, Long examId) {
public String importData(List<EduCruitStudentExportVo> list, Long examId) {
// 准备记录日志数据
int successNum = 0;
StringBuilder successMsg = new StringBuilder();
int failureNum = 0;
StringBuilder failureMsg = new StringBuilder();
for(RecruitEduExportVo vo : list){
for(EduCruitStudentExportVo vo : list){
LambdaQueryWrapper<EduRecruitStudent> lqw = new LambdaQueryWrapper<>();
lqw.eq(EduRecruitStudent::getEduIdCard,vo.getEduIdCard()).eq(EduRecruitStudent::getExamId,examId);
List<EduRecruitStudent> students = eduRecruitStudentMapper.selectList(lqw);
......@@ -94,8 +87,6 @@ public class EduRecruitStudentServiceImpl extends ServiceImpl<EduRecruitStudentM
//去除空格
student.setEduIdCard(StringUtil.clearSpace(vo.getEduIdCard()));
student.setEduStudentName(StringUtil.clearSpace(vo.getEduStudentName()));
student.setEduStudentNumber(StringUtil.clearSpace(vo.getEduStudentNumber()));
student.setEduSchoolName(StringUtil.clearSpace(vo.getEduSchoolName()));
student.setEduProject(StringUtil.clearSpace(vo.getEduProject()));
student.setEduSex(vo.getEduSex());
//设置测试项目id
......@@ -107,7 +98,6 @@ public class EduRecruitStudentServiceImpl extends ServiceImpl<EduRecruitStudentM
}
//设置初中学校id
LambdaQueryWrapper<JuniorHighSchool> schoolLqw = new LambdaQueryWrapper<>();
schoolLqw.eq(JuniorHighSchool::getSchoolName,StringUtil.clearSpace(vo.getEduSchoolName()));
List<JuniorHighSchool> schools = schoolMapper.selectList(schoolLqw);
if(StringUtils.isNotNull(schools) && schools.size() > 0){
student.setEduJuniorId(schools.get(0).getId());
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/recruit/IEduRecruitStudentService.java
......@@ -2,14 +2,15 @@ package yangtz.cs.liu.campus.service.recruit;
import com.baomidou.mybatisplus.extension.service.IService;
import yangtz.cs.liu.campus.domain.recruit.EduRecruitStudent;
import yangtz.cs.liu.campus.vo.examination.EduCruitStudentExportVo;
import yangtz.cs.liu.campus.vo.recruit.RecruitEduExportVo;
import java.util.List;
public interface IEduRecruitStudentService extends IService<EduRecruitStudent> {
//校验导入的数据
void checkImport(List<RecruitEduExportVo> list);
void checkImport(List<EduCruitStudentExportVo> list);
//数据导入
String importData(List<RecruitEduExportVo> list, Long examId);
String importData(List<EduCruitStudentExportVo> list, Long examId);
}
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/examination/EduCruitStudentExportVo.java 0 → 100644
package yangtz.cs.liu.campus.vo.examination;
import com.ruoyi.common.annotation.Excel;
import lombok.Data;
/**
* @author xuten
*/
@Data
public class EduCruitStudentExportVo {
/**
* 序号
* */
@Excel(name = "序号")
private int xh;
/** 身份证号 */
@Excel(name = "身份证号", width = 25)
private String eduIdCard;
/** 姓名 */
@Excel(name = "姓名")
private String eduStudentName;
/** 性别（0=男，1=女） */
@Excel(name = "性别",combo = {"男","女"}, readConverterExp = "0=男,1=女")
private String eduSex;
/** 测试项目 */
@Excel(name = "测试项目")
private String eduProject;
}
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/recruit/RecruitEduStudentVo.java deleted 100644 → 0
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;
}
smart-campus/src/main/resources/mapper/recruit/SchoolRecruitRelationMapper.xml
......@@ -37,14 +37,27 @@
</select>
<select id="getInfoCheck" resultType="yangtz.cs.liu.campus.vo.recruit.RecruitEduStudentVo">
select sar.id, sar.exam_id, sar.student_id, sar.audit_status, sar.info_id_card,
sas.student_name, sas.id_card, sas.student_number,sar.junior_id, jhs.school_name,
sar.test_id, stp.project,sas.sex, sas.photo
select sar.id,
sar.exam_id,
sar.student_id,
sar.audit_status,
sar.info_id_card,
sas.student_name,
sas.id_card,
sas.student_number,
sar.junior_id,
jhs.school_name,
sar.test_id,
stp.project,
sas.sex,
sas.photo
from school_recruit_relation sar
left join school_recruit_student sas on sas.id = sar.student_id
left join school_recruit_project stp on stp.id = sar.test_id
left join junior_high_school jhs on jhs.id = sar.junior_id
where sar.del_flag = '0' and sas.del_flag = '0' and sar.exam_id = #{examId}
left join school_recruit_student sas on sas.id = sar.student_id
left join school_recruit_project stp on stp.id = sar.test_id
left join junior_high_school jhs on jhs.id = sar.junior_id
where sar.del_flag = '0'
and sas.del_flag = '0'
and sar.exam_id = #{examId}
order by sar.create_time desc
</select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment