From 7a21d94bf06b500a5083ea7405e7dd69621893e4 Mon Sep 17 00:00:00 2001 From: zhouwentao <1577701412@qq.com> Date: Wed, 20 Mar 2024 17:40:20 +0800 Subject: [PATCH] updates --- .../mini/service/MiniTestCulturalService.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/service/MiniTestCulturalService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/service/MiniTestCulturalService.java index 921a532..274573b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/service/MiniTestCulturalService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/service/MiniTestCulturalService.java @@ -68,8 +68,6 @@ public class MiniTestCulturalService { yxSchoolMajorLambdaQueryWrapper.eq(YxSchoolMajor::getMajorType, userScore.getProfessionalCategory()); yxSchoolMajorLambdaQueryWrapper.eq(YxSchoolMajor::getCategory,cognitioPolyclinic); - yxHistoryScoreControlLineLambdaQueryWrapper.eq(YxHistoryScoreControlLine::getProfessionalCategory, userScore.getProfessionalCategory()); - yxHistoryScoreControlLineLambdaQueryWrapper.eq(YxHistoryScoreControlLine::getCategory,cognitioPolyclinic); String a_ = "_"; yxSchoolMajorLambdaQueryWrapper.eq(YxSchoolMajor::getSchoolCode, schoolCode); List yxSchoolMajorList = yxSchoolMajorService.list(yxSchoolMajorLambdaQueryWrapper); @@ -95,6 +93,14 @@ public class MiniTestCulturalService { historyMajorEnrollMap.put(h.getYear() + a_ + h.getCategory() + a_ + h.getMajorName() + a_ + h.getBatch(), h); } //获取 省控线 + if ("舞蹈类".equals(userScore.getProfessionalCategory())) { + yxHistoryScoreControlLineLambdaQueryWrapper.like(YxHistoryScoreControlLine::getProfessionalCategory, "舞"); + yxHistoryScoreControlLineLambdaQueryWrapper.eq(YxHistoryScoreControlLine::getCategory,cognitioPolyclinic); + }else{ + yxHistoryScoreControlLineLambdaQueryWrapper.eq(YxHistoryScoreControlLine::getProfessionalCategory, userScore.getProfessionalCategory()); + yxHistoryScoreControlLineLambdaQueryWrapper.eq(YxHistoryScoreControlLine::getCategory,cognitioPolyclinic); + } + List historyScoreControlLineList = yxHistoryScoreControlLineService.list(yxHistoryScoreControlLineLambdaQueryWrapper); Map yxHistoryScoreControlLineMap = new LinkedHashMap<>();//key:文科_美术学_提前批 String key = null; @@ -137,7 +143,12 @@ public class MiniTestCulturalService { artTestCulturalDto.setYear(yxHistoryMajorEnroll.getYear()); artTestCulturalDto.setScore(yxHistoryMajorEnroll.getAdmissionLine()); //获取上一年的 省控分信息 - key = yxSchoolMajor.getCategory() + a_ + yxSchoolMajor.getMajorType() + a_ + (yxSchoolMajor.getBatch().equals("提前批") ? "本科A段" : yxSchoolMajor.getBatch()); + if ("舞蹈类".equals(yxSchoolMajor.getMajorType())) { + key = yxSchoolMajor.getCategory() + a_ + yxSchoolMajor.getMainSubjects()+"类" + a_ + (yxSchoolMajor.getBatch().equals("提前批") ? "本科A段" : yxSchoolMajor.getBatch()); + }else{ + key = yxSchoolMajor.getCategory() + a_ + yxSchoolMajor.getMajorType() + a_ + (yxSchoolMajor.getBatch().equals("提前批") ? "本科A段" : yxSchoolMajor.getBatch()); + } + yxHistoryScoreControlLine = yxHistoryScoreControlLineMap.get(yxHistoryMajorEnroll.getYear() + a_ + key); if (yxHistoryScoreControlLine != null) { //文化分控线