yitisheng
/
yitisheng-new-api
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updates 显示24省控线

This commit is contained in:
zhouwentao 2024-06-28 07:25:22 +08:00
parent 0fea2ca6ae
commit 589c362390
3 changed files with 36 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniRecommendMajorController.java
View File

@ -147,6 +147,9 @@ public class MiniRecommendMajorController {
}
//根据录取方式，计算折合分数
for (String rulesEnrollProbability : maps.keySet()) {
if (StringUtils.isBlank(rulesEnrollProbability)) {
continue;
}
Optional<YxSchoolMajor> any = schooMajorList.stream().filter(s -> s.getRulesEnrollProbability().equals(rulesEnrollProbability)).findAny();
if (any.isPresent()) {
YxSchoolMajor yxSchoolMajor = any.get();

51
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryScoreControlLineController.java
View File

@ -103,26 +103,41 @@ public class YxHistoryScoreControlLineController extends JeecgController<YxHisto
for (YxHistoryScoreControlLine historyScoreControlLine : historyScoreControlLineList) {
year = historyScoreControlLine.getYear();
batch = historyScoreControlLine.getBatch();
if (YxConstant.nowYear.equals(year)) {
if (!"高职高专".equals(batch)) {
historyScoreControlLine.setCulturalScore(YxConstant.bigDecimal0);
historyScoreControlLine.setCulturalScoreXk(YxConstant.bigDecimal0);
historyScoreControlLine.setSpecialScore(YxConstant.bigDecimal0);
historyScoreControlLine.setSpecialScoreXk(YxConstant.bigDecimal0);
}else{
historyScoreControlLine.setCulturalScore(YxConstant.bigDecimal0);
historyScoreControlLine.setCulturalScoreXk(YxConstant.bigDecimal0);
// if (YxConstant.nowYear.equals(year)) {
// if (!"高职高专".equals(batch)) {
// historyScoreControlLine.setCulturalScore(YxConstant.bigDecimal0);
// historyScoreControlLine.setCulturalScoreXk(YxConstant.bigDecimal0);
// historyScoreControlLine.setSpecialScore(YxConstant.bigDecimal0);
// historyScoreControlLine.setSpecialScoreXk(YxConstant.bigDecimal0);
// }else{
// historyScoreControlLine.setCulturalScore(YxConstant.bigDecimal0);
// historyScoreControlLine.setCulturalScoreXk(YxConstant.bigDecimal0);
// }
// }
if ("2024".equals(year)) {
if (batch.equals("本科B段")) {
continue;
}
if(batch.equals("本科A段")){
historyScoreControlLine.setBatch("本科批");
}
list = dataMaps.getOrDefault(year,new ArrayList<>());
list.add(historyScoreControlLine);
dataMaps.put(year,list);
}else{
list = dataMaps.getOrDefault(year,new ArrayList<>());
if ("本科A段".equals(batch)) {
YxHistoryScoreControlLine yxHistoryScoreControlLine1 = new YxHistoryScoreControlLine();
BeanUtils.copyProperties(historyScoreControlLine,yxHistoryScoreControlLine1);
yxHistoryScoreControlLine1.setBatch("本科提前批");
list.add(yxHistoryScoreControlLine1);
}
list.add(historyScoreControlLine);
dataMaps.put(year,list);
}
list = dataMaps.getOrDefault(year,new ArrayList<>());
if ("本科A段".equals(batch)) {
YxHistoryScoreControlLine yxHistoryScoreControlLine1 = new YxHistoryScoreControlLine();
BeanUtils.copyProperties(historyScoreControlLine,yxHistoryScoreControlLine1);
yxHistoryScoreControlLine1.setBatch("本科提前批");
list.add(yxHistoryScoreControlLine1);
}
list.add(historyScoreControlLine);
dataMaps.put(year,list);
}
json = JSONObject.toJSONString(dataMaps);
redisUtil.set(key,json,3600);

3
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVolunteerServiceImpl.java
View File

@ -49,9 +49,6 @@ public class YxVolunteerServiceImpl extends ServiceImpl<YxVolunteerMapper, YxVol
@Resource
private YxVolunteerRecordMapper yxVolunteerRecordMapper;
final static BigDecimal bigDecimal100 = new BigDecimal("100");//100倍率
@Override
public VolunteerDTO getActiveByCreate(String createBy) {
VolunteerDTO volunteerDTO = new VolunteerDTO();