updates
This commit is contained in:
parent
38df1a8178
commit
03c7977496
|
|
@ -216,10 +216,10 @@ public class YxHistoryMajorEnrollController extends JeecgController<YxHistoryMaj
|
||||||
public Result<?> insertNewMajorList() {
|
public Result<?> insertNewMajorList() {
|
||||||
LambdaQueryWrapper<YxHistoryMajorEnroll> helqw = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<YxHistoryMajorEnroll> helqw = new LambdaQueryWrapper<>();
|
||||||
helqw.eq(YxHistoryMajorEnroll::getYear,"2024");
|
helqw.eq(YxHistoryMajorEnroll::getYear,"2024");
|
||||||
helqw.eq(YxHistoryMajorEnroll::getMajorType,"美术与设计类");
|
helqw.eq(YxHistoryMajorEnroll::getMajorType,"体育类");
|
||||||
List<YxHistoryMajorEnroll> list = yxHistoryMajorEnrollService.list(helqw);
|
List<YxHistoryMajorEnroll> list = yxHistoryMajorEnrollService.list(helqw);
|
||||||
LambdaQueryWrapper<YxSchoolMajor> smlqw = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<YxSchoolMajor> smlqw = new LambdaQueryWrapper<>();
|
||||||
smlqw.eq(YxSchoolMajor::getMajorType,"美术与设计类");
|
smlqw.eq(YxSchoolMajor::getMajorType,"体育类");
|
||||||
List<YxSchoolMajor> yxSchoolMajorList = yxSchoolMajorService.list(smlqw);
|
List<YxSchoolMajor> yxSchoolMajorList = yxSchoolMajorService.list(smlqw);
|
||||||
Map<String ,YxSchoolMajor> map = new HashMap<>();
|
Map<String ,YxSchoolMajor> map = new HashMap<>();
|
||||||
String key = "";
|
String key = "";
|
||||||
|
|
@ -619,7 +619,7 @@ public class YxHistoryMajorEnrollController extends JeecgController<YxHistoryMaj
|
||||||
zhuanyeBili = YxConstant.bigDecimal100;
|
zhuanyeBili = YxConstant.bigDecimal100;
|
||||||
}
|
}
|
||||||
yxHistoryMajorEnroll.setControlLine((culturalScore.multiply(wenhuaBili)).add((specialScore.multiply(zhuanyeBili))));
|
yxHistoryMajorEnroll.setControlLine((culturalScore.multiply(wenhuaBili)).add((specialScore.multiply(zhuanyeBili))));
|
||||||
yxHistoryMajorEnroll.setRulesEnrollProbability(probabilityOperator);
|
yxHistoryMajorEnroll.setRulesEnrollProbability(rulesEnrollProbability);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue