Commit e7dbd6eb authored by cy's avatar cy

专业查询添加录取批次条件

parent 968e413d
...@@ -16,5 +16,5 @@ public interface ProfessionService { ...@@ -16,5 +16,5 @@ public interface ProfessionService {
* 获取专业树结构 * 获取专业树结构
* @return 树列表 * @return 树列表
*/ */
R<List<Profession>> getTree(Integer type,Integer userId); R<List<Profession>> getTree(Integer type,Integer userId,String gradeType);
} }
...@@ -7,11 +7,13 @@ import cn.wisenergy.mapper.ScoreInfoMapper; ...@@ -7,11 +7,13 @@ import cn.wisenergy.mapper.ScoreInfoMapper;
import cn.wisenergy.model.app.AdmissionRule; import cn.wisenergy.model.app.AdmissionRule;
import cn.wisenergy.model.app.Profession; import cn.wisenergy.model.app.Profession;
import cn.wisenergy.model.app.ScoreInfo; import cn.wisenergy.model.app.ScoreInfo;
import cn.wisenergy.model.enums.GradeType;
import cn.wisenergy.model.enums.SchemeTypeEnums; import cn.wisenergy.model.enums.SchemeTypeEnums;
import cn.wisenergy.model.enums.StudentType; import cn.wisenergy.model.enums.StudentType;
import cn.wisenergy.service.app.ProfessionService; import cn.wisenergy.service.app.ProfessionService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -38,14 +40,14 @@ public class ProfessionServiceImpl extends ServiceImpl<ProfessionMapper, Profess ...@@ -38,14 +40,14 @@ public class ProfessionServiceImpl extends ServiceImpl<ProfessionMapper, Profess
private AdmissionRuleMapper admissionRuleMapper; private AdmissionRuleMapper admissionRuleMapper;
@Override @Override
public R<List<Profession>> getTree(Integer type, Integer userId) { public R<List<Profession>> getTree(Integer type, Integer userId,String gradeType) {
log.info("volunteer-service[]ProfessionServiceImpl[]getTree[]input.method"); log.info("volunteer-service[]ProfessionServiceImpl[]getTree[]input.method");
if (null == type || null == userId) { if (null == type || null == userId) {
return R.error("入参为空!"); return R.error("入参为空!");
} }
//获取方案类型 //获取方案类型
Integer schemeType = getSchemeType(type, userId); Integer schemeType = getSchemeType(type, userId,gradeType);
if (null == schemeType) { if (null == schemeType) {
return R.error("考生成绩信息不存在!"); return R.error("考生成绩信息不存在!");
} }
...@@ -97,7 +99,7 @@ public class ProfessionServiceImpl extends ServiceImpl<ProfessionMapper, Profess ...@@ -97,7 +99,7 @@ public class ProfessionServiceImpl extends ServiceImpl<ProfessionMapper, Profess
} }
private Integer getSchemeType(Integer type, Integer userId) { private Integer getSchemeType(Integer type, Integer userId,String gradeType) {
//获取用户成绩 //获取用户成绩
ScoreInfo scoreInfo = scoreInfoMapper.getByUserId(userId); ScoreInfo scoreInfo = scoreInfoMapper.getByUserId(userId);
if (null == scoreInfo) { if (null == scoreInfo) {
...@@ -114,7 +116,9 @@ public class ProfessionServiceImpl extends ServiceImpl<ProfessionMapper, Profess ...@@ -114,7 +116,9 @@ public class ProfessionServiceImpl extends ServiceImpl<ProfessionMapper, Profess
//本科类比文化分 = 本年录取分 -去年录取分 + 考生分数 //本科类比文化分 = 本年录取分 -去年录取分 + 考生分数
double culture = firstRule.getCurrentYearCulture() - firstRule.getCultureMin() + scoreInfo.getCultureGrade(); double culture = firstRule.getCurrentYearCulture() - firstRule.getCultureMin() + scoreInfo.getCultureGrade();
if (culture >= firstRule.getCultureMin()) { boolean graType = !StringUtils.isBlank(gradeType) && GradeType.UNDERGRADUATE.getDescription().equals(gradeType);
boolean grade = StringUtils.isBlank(gradeType) && culture >= firstRule.getCultureMin();
if (graType || grade) {
return SchemeTypeEnums.UNDERGRADUATE_CULTURE.getCode(); return SchemeTypeEnums.UNDERGRADUATE_CULTURE.getCode();
} }
...@@ -132,8 +136,9 @@ public class ProfessionServiceImpl extends ServiceImpl<ProfessionMapper, Profess ...@@ -132,8 +136,9 @@ public class ProfessionServiceImpl extends ServiceImpl<ProfessionMapper, Profess
//专科类比分 = 本年录取分 -去年录取分 + 考生分数 //专科类比分 = 本年录取分 -去年录取分 + 考生分数
double trueCulture = firstRule.getCurrentYearCulture() - firstRule.getCultureMin() + scoreInfo.getCultureGrade(); double trueCulture = firstRule.getCurrentYearCulture() - firstRule.getCultureMin() + scoreInfo.getCultureGrade();
double trueMajor = firstRule.getCurrentYearMajor() - firstRule.getProfessionMin() + scoreInfo.getMajorGrade(); double trueMajor = firstRule.getCurrentYearMajor() - firstRule.getProfessionMin() + scoreInfo.getMajorGrade();
if (trueCulture >= firstRule.getCultureMin() && boolean graType = !StringUtils.isBlank(gradeType) && GradeType.UNDERGRADUATE.getDescription().equals(gradeType);
trueMajor >= firstRule.getProfessionMin()) { boolean grade = StringUtils.isBlank(gradeType) && trueCulture >= firstRule.getCultureMin() && trueMajor >= firstRule.getProfessionMin();
if (graType || grade) {
return SchemeTypeEnums.UNDERGRADUATE_ARTS.getCode(); return SchemeTypeEnums.UNDERGRADUATE_ARTS.getCode();
} }
...@@ -152,7 +157,9 @@ public class ProfessionServiceImpl extends ServiceImpl<ProfessionMapper, Profess ...@@ -152,7 +157,9 @@ public class ProfessionServiceImpl extends ServiceImpl<ProfessionMapper, Profess
//综合成绩差值 //综合成绩差值
double value = firstRule.getCurrentYearCulture() - firstRule.getCultureMin(); double value = firstRule.getCurrentYearCulture() - firstRule.getCultureMin();
double total = scoreInfo.getMajorGrade() * 750 / 100 * 0.7 + scoreInfo.getCultureGrade() * 0.3 - value; double total = scoreInfo.getMajorGrade() * 750 / 100 * 0.7 + scoreInfo.getCultureGrade() * 0.3 - value;
if (total >= firstRule.getCultureMin()) { boolean graType = !StringUtils.isBlank(gradeType) && GradeType.UNDERGRADUATE.getDescription().equals(gradeType);
boolean grade = StringUtils.isBlank(gradeType) && total >= firstRule.getCultureMin();
if (graType || grade) {
return SchemeTypeEnums.UNDERGRADUATE_SPORTS.getCode(); return SchemeTypeEnums.UNDERGRADUATE_SPORTS.getCode();
} }
return SchemeTypeEnums.JUNIOR_COLLEGE_SPORTS.getCode(); return SchemeTypeEnums.JUNIOR_COLLEGE_SPORTS.getCode();
...@@ -169,7 +176,9 @@ public class ProfessionServiceImpl extends ServiceImpl<ProfessionMapper, Profess ...@@ -169,7 +176,9 @@ public class ProfessionServiceImpl extends ServiceImpl<ProfessionMapper, Profess
//专科类比分 = 本年录取分 -去年录取分 + 考生分数 //专科类比分 = 本年录取分 -去年录取分 + 考生分数
double trueCulture = firstRule.getCurrentYearCulture() - firstRule.getCultureMin() + scoreInfo.getCultureGrade(); double trueCulture = firstRule.getCurrentYearCulture() - firstRule.getCultureMin() + scoreInfo.getCultureGrade();
double trueMajor = firstRule.getCurrentYearMajor() - firstRule.getProfessionMin() + scoreInfo.getMajorGrade(); double trueMajor = firstRule.getCurrentYearMajor() - firstRule.getProfessionMin() + scoreInfo.getMajorGrade();
if (trueCulture >= firstRule.getCultureMin() && trueMajor >= firstRule.getProfessionMin()) { boolean graType = !StringUtils.isBlank(gradeType) && GradeType.UNDERGRADUATE.getDescription().equals(gradeType);
boolean grade = StringUtils.isBlank(gradeType) && trueCulture >= firstRule.getCultureMin() && trueMajor >= firstRule.getProfessionMin();
if (graType || grade) {
return SchemeTypeEnums.UNDERGRADUATE_LITERATURE.getCode(); return SchemeTypeEnums.UNDERGRADUATE_LITERATURE.getCode();
} }
......
...@@ -32,13 +32,14 @@ public class ProfessionController { ...@@ -32,13 +32,14 @@ public class ProfessionController {
@ApiOperation(value = "获取专业树结构", notes = "获取专业树结构", httpMethod = "GET") @ApiOperation(value = "获取专业树结构", notes = "获取专业树结构", httpMethod = "GET")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "type", value = "考生类型 1:文化考生 2:美术考生 3:体育生 4:文学编导", dataType = "int"), @ApiImplicitParam(name = "type", value = "考生类型 1:文化考生 2:美术考生 3:体育生 4:文学编导", dataType = "int"),
@ApiImplicitParam(name = "userId", value = "考生id", dataType = "int") @ApiImplicitParam(name = "userId", value = "考生id", dataType = "int"),
@ApiImplicitParam(name = "gradeType", value = "考生批次 (本科、专科)", dataType = "String")
}) })
@GetMapping("/getTree") @GetMapping("/getTree")
public R<List<Profession>> getTree(Integer type,Integer userId) { public R<List<Profession>> getTree(Integer type,Integer userId,String gradeType) {
if (null == type || null == userId) { if (null == type || null == userId) {
return R.error("入参为空!"); return R.error("入参为空!");
} }
return professionService.getTree(type,userId); return professionService.getTree(type,userId,gradeType);
} }
} }
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