Skip to content

V
volunteer_service
Commit 7a5c10f5 authored by cy's avatar cy
Browse files
Options

方案查询修改

parent efd0d33c
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 28 deletions
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/SchemeServiceImpl.java
View file @ 7a5c10f5
......@@ -126,7 +126,7 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
//1).判断文化课的分数是否大于等于最大文化分
//本科类比文化分 = 考生分数-( 本年录取分 -去年录取分)
double firstCulture = Double.parseDouble(queryVo.getCultureGrade())-
double firstCulture = Double.parseDouble(queryVo.getCultureGrade()) -
(firstRule.getCurrentYearCulture() - firstRule.getCultureMin());
double cultureMax = Double.parseDouble(firstRule.getCultureMax().toString());
if (firstCulture >= cultureMax) {
......@@ -137,7 +137,7 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
//2).判断文化课的分数是否小于最小报考分数
//专科类比文化分 = 本年录取分 -去年录取分 + 考生分数
double secondCulture = Double.parseDouble(queryVo.getCultureGrade())-(secondRule.getCurrentYearCulture() - secondRule.getCultureMin()) ;
double secondCulture = Double.parseDouble(queryVo.getCultureGrade()) - (secondRule.getCurrentYearCulture() - secondRule.getCultureMin());
double cultureMin = Double.parseDouble(secondRule.getCultureMin().toString());
if (secondCulture < cultureMin) {
return R.error("很抱歉，您的成绩不满足报考条件，无法查询!");
......@@ -163,9 +163,9 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
//判断考生是否有报取资格
//专科类比分 = 考生分数-( 本年录取分 -去年录取分)
double secondCulture = Double.parseDouble(queryVo.getCultureGrade())-
double secondCulture = Double.parseDouble(queryVo.getCultureGrade()) -
(secondRule.getCurrentYearCulture() - secondRule.getCultureMin());
double secondMajor =Double.parseDouble(queryVo.getMajorGrade())-
double secondMajor = Double.parseDouble(queryVo.getMajorGrade()) -
(secondRule.getCurrentYearMajor() - secondRule.getProfessionMin());
if (secondCulture < secondRule.getCultureMin() || secondMajor < secondRule.getProfessionMin()) {
return R.error("很抱歉，您的成绩不满足报考条件，无法查询!");
......@@ -192,9 +192,9 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
//判断考生是否有报取资格
//专科类比分 =考生分数-( 本年录取分 -去年录取分)
double secondCulture = Double.parseDouble(queryVo.getCultureGrade()) -
(secondRule.getCurrentYearCulture() - secondRule.getCultureMin() );
double secondMajor =Double.parseDouble(queryVo.getMajorGrade())-
(secondRule.getCurrentYearMajor() - secondRule.getProfessionMin() );
(secondRule.getCurrentYearCulture() - secondRule.getCultureMin());
double secondMajor = Double.parseDouble(queryVo.getMajorGrade()) -
(secondRule.getCurrentYearMajor() - secondRule.getProfessionMin());
if (secondCulture < secondRule.getCultureMin() || secondMajor < secondRule.getProfessionMin()) {
return R.error("很抱歉，您的专业成绩不满足报考条件，无法查询!");
}
......@@ -229,7 +229,7 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
}
totalResult = firstRule.getNumber();
list = getSportsList(culture,major, firstRule, secondRule, className, professionName, gradeType);
list = getSportsList(culture, major, firstRule, secondRule, className, professionName, gradeType);
}
//4、判断返回的结果数据是否大于totalResult
......@@ -799,11 +799,11 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
double culture = Double.parseDouble(queryVo.getCultureGrade()) -
(firstRule.getCurrentYearCulture() - firstRule.getCultureMin());
double major = Double.parseDouble(queryVo.getMajorGrade()) -
(firstRule.getCurrentYearMajor() - firstRule.getProfessionMin()) ;
(firstRule.getCurrentYearMajor() - firstRule.getProfessionMin());
//计算综合成绩
double total = major * 750 / 300 * 0.7 + culture * 0.3;
BigDecimal b = new BigDecimal(total);
total = b.setScale(2, RoundingMode.HALF_UP).doubleValue();
BigDecimal b = new BigDecimal(total);
total = b.setScale(2, RoundingMode.HALF_UP).doubleValue();
Map<String, Object> map = new HashMap<>(16);
map.put("number", firstRule.getNumber());
......@@ -849,14 +849,14 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
//专科科类比分 = 本年录取分 -去年录取分 + 考生分数
double secondCulture = Double.parseDouble(queryVo.getCultureGrade()) -
(secondRule.getCurrentYearCulture() - secondRule.getCultureMin() );
(secondRule.getCurrentYearCulture() - secondRule.getCultureMin());
double secondMajor = Double.parseDouble(queryVo.getMajorGrade()) -
(secondRule.getCurrentYearMajor() - secondRule.getProfessionMin() );
(secondRule.getCurrentYearMajor() - secondRule.getProfessionMin());
//计算综合成绩
double secondRuleTotal = secondMajor * 750 / 300 * 0.7 + secondCulture * 0.3;
BigDecimal rel = new BigDecimal(secondRuleTotal);
secondRuleTotal = rel.setScale(2, RoundingMode.HALF_UP).doubleValue();
BigDecimal rel = new BigDecimal(secondRuleTotal);
secondRuleTotal = rel.setScale(2, RoundingMode.HALF_UP).doubleValue();
//获取该类型录取最高分数
double high = volunteerMapper.getMaxLowestMark(SchemeTypeEnums.JUNIOR_COLLEGE_ARTS.getCode());
......@@ -912,11 +912,11 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
double culture = Double.parseDouble(queryVo.getCultureGrade()) -
(firstRule.getCurrentYearCulture() - firstRule.getCultureMin());
double major = Double.parseDouble(queryVo.getMajorGrade()) -
(firstRule.getCurrentYearMajor() - firstRule.getProfessionMin()) ;
(firstRule.getCurrentYearMajor() - firstRule.getProfessionMin());
//计算综合成绩
double total = major * 750 / 300 * 0.3 + culture * 0.7;
BigDecimal b = new BigDecimal(total);
total = b.setScale(2, RoundingMode.HALF_UP).doubleValue();
BigDecimal b = new BigDecimal(total);
total = b.setScale(2, RoundingMode.HALF_UP).doubleValue();
Map<String, Object> map = new HashMap<>(16);
map.put("number", firstRule.getNumber());
map.put("classNames", classNames);
......@@ -966,7 +966,7 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
/**
* 获取体育生生志愿方案
*
* @param culture 考生文化成绩
* @param culture 考生文化成绩
* @param major 考生专业成绩
* @param firstRule 本科规则
* @param secondRule 专科规则
......@@ -974,16 +974,16 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
* @param professionNames 专业名称
* @return 志愿方案列表
*/
private List<Volunteer> getSportsList(double culture,double major, AdmissionRule firstRule, AdmissionRule secondRule,
private List<Volunteer> getSportsList(double culture, double major, AdmissionRule firstRule, AdmissionRule secondRule,
List<String> classNames, List<String> professionNames, String gradeType) {
Map<String, Object> map = new HashMap<>(16);
map.put("number", firstRule.getNumber());
map.put("classNames", classNames);
map.put("professionNames", professionNames);
double value = firstRule.getCurrentYearCulture() - firstRule.getCultureMin();
double total= major * 750 / 100 * 0.7 + culture * 0.3 - value;
BigDecimal b = new BigDecimal(total);
total = b.setScale(2, RoundingMode.HALF_UP).doubleValue();
double total = major * 750 / 100 * 0.7 + culture * 0.3 - value;
BigDecimal b = new BigDecimal(total);
total = b.setScale(2, RoundingMode.HALF_UP).doubleValue();
//1、考生是否能报取体育本科
List<Volunteer> list = new ArrayList<>();
boolean type = !StringUtils.isBlank(gradeType) && GradeType.UNDERGRADUATE.getDescription().equals(gradeType);
......@@ -1186,9 +1186,9 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
if (resultList.size() < totalNumber) {
int num = totalNumber - resultList.size();
List<Volunteer> volunteers = new ArrayList<>();
if (endList.size() > 0) {
for (int i = 0; i < num; i++) {
Random mRandom = new Random();
for (int i = 0; i < num; i++) {
Random mRandom = new Random();
if (endList.size() > 0) {
int count = mRandom.nextInt(endList.size());
if (resultList.contains(endList.get(count))) {
endList.remove(count);
......@@ -1328,5 +1328,4 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
}
}
wisenergy-web-admin/src/main/resources/application-prod.yml
View file @ 7a5c10f5
......@@ -5,7 +5,7 @@ spring:
type: com.alibaba.druid.pool.DruidDataSource
druid:
driver-class-name: com.mysql.cj.jdbc.Driver
#url: jdbc:mysql://192.168.110.165:3306/volunteer?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8&useSSL=false&serverTimezone=Asia/Shanghai
#url: jdbc:mysql://8.140.102.52:3306/volunteer?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8&useSSL=false&serverTimezone=Asia/Shanghai
url: jdbc:mysql://localhost:3306/volunteer?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8&useSSL=false&serverTimezone=Asia/Shanghai
#url: jdbc:mysql://rm-bp1i44rtb091fk06coo.mysql.rds.aliyuncs.com:3306/volunteer?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false
username: root
......
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