Commit 3d453e6a authored by liaoanyuan's avatar liaoanyuan

PC端方案查询修改

parent 45d7f1f1
......@@ -4,11 +4,13 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@Data
@ApiModel(value = "RefillCard")
public class RefillCard {
public class RefillCard implements Serializable {
private static final long serialVersionUID = 4018232893584885138L;
/**
* 充值卡id
*/
......
......@@ -36,7 +36,7 @@ public class Volunteer implements Serializable {
private Integer id;
/**
* 方案类型:1:本科文化一批 2:本科美术一批 3:艺术本科批文学编导 4:本科体育 5:专科专业分类6:专科美术一批 7:专科文学编导一批 8:专科体育一批
* 方案类型:1:本科文化一批 2:本科美术一批 3:艺术本科批文学编导 4:本科体育 5:专科专业分类 6:专科美术一批 7:专科文学编导一批 8:专科体育一批
*/
@ApiModelProperty(value = "方案类型:1:本科文化一批 2:本科美术一批 3:艺术本科批文学编导 4:本科体育 " +
"5:专科专业分类 6:专科美术一批 7:专科文学编导一批 8:专科体育一批", name = "type")
......
......@@ -62,7 +62,6 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
@Autowired
private VolunteerManager volunteerManager;
@Override
public R<VolunteerVo> getList(SchemeVo queryVo) {
log.info("volunteer-service[]SchemeServiceImpl[]getList[]input.param.queryVo:" + queryVo);
......@@ -446,6 +445,11 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
double secondMajor = secondRule.getCurrentYearMajor() - secondRule.getProfessionMin() +
Double.parseDouble(queryVo.getMajorGrade());
//判断文化成绩大于本科文化成绩最低分但专业成绩小于本科文化成绩最低分时进行文化成绩降分处理查询
if (secondCulture > firstRule.getCultureMin() && secondMajor < firstRule.getProfessionMin()) {
secondCulture=secondRule.getCultureMax();
}
//计算综合成绩
double secondRuleTotal = secondMajor * 750 / 300 * 0.7 + secondCulture * 0.3;
//2、考生是否能报取美术专科
......@@ -516,8 +520,15 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
//专科类比分 = 本年录取分 -去年录取分 + 考生分数
double cultureSecond = firstRule.getCurrentYearCulture() - firstRule.getCultureMin() + Double.parseDouble(queryVo.getCultureGrade());
double majorSecond = firstRule.getCurrentYearMajor() - firstRule.getProfessionMin() + Double.parseDouble(queryVo.getMajorGrade());
//判断文化成绩大于本科文化成绩最低分但专业成绩小于本科文化成绩最低分时进行文化成绩降分处理查询
if (cultureSecond > firstRule.getCultureMin() && majorSecond < firstRule.getProfessionMin()) {
cultureSecond=secondRule.getCultureMax();
}
//计算综合成绩
double totalSecond = majorSecond * 750 / 300 * 0.3 + cultureSecond * 0.7;
//2、考生是否能报取美术专科
if (cultureSecond >= secondRule.getCultureMin() && majorSecond >= secondRule.getProfessionMin()) {
//浮动分数
......
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