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

updates

This commit is contained in:
zhouwentao 2024-03-18 21:19:01 +08:00
parent e4c57c5021
commit d37227c12d
2 changed files with 38 additions and 25 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/yx/mapper/xml/YxSchoolMapper.xml
View File

@ -328,7 +328,8 @@
FROM yx_school s
LEFT JOIN yx_school_child sc ON s.id = sc.school_id
LEFT JOIN yx_school_major sm ON sm.school_code = sc.school_code
where 1=1 AND s.is_ys = 1
where 1=1
/*AND s.is_ys = 1*/
<if test="qvo.schoolName!=null and qvo.schoolName!=''">
AND (s.school_name like concat('%',#{qvo.schoolName},'%') or sc.school_code like concat('%',#{qvo.schoolName},'%'))
</if>

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

@ -111,7 +111,7 @@ public class MusicService {
culturalControlLine = batchControlLineMaps.get(recommendMajorDTO.getBatch()).getCulturalScore();
specialControlLine = batchControlLineMaps.get(recommendMajorDTO.getBatch()).getSpecialScore();
if (recommendMajorDTO.getSchoolCode().equals("9941") && recommendMajorDTO.getBatch().equals("提前批") && recommendMajorDTO.getEnrollmentCode().contains("08")) {
if (recommendMajorDTO.getSchoolCode().equals("6040") && recommendMajorDTO.getBatch().equals("本科A段") && recommendMajorDTO.getEnrollmentCode().contains("06")) {
System.out.println("111");
}
//没有计算方式 跳过
@ -167,9 +167,21 @@ public class MusicService {
professionalScore3 = yybysy;
}
} else {
//音乐教育
professionalScore3 = yyjy;
professionalScore2 = activeCurrentUserScore.getYyjy();
//音乐教育,用当前成绩算 然后同时出现声乐和音教就用最高的去算
if(mainSubjects.contains("器乐") && mainSubjects.contains("声乐")){
professionalScore2 = activeCurrentUserScore.getYybyqy().max(activeCurrentUserScore.getYybysy());
professionalScore3 = yybyqy.max(yybysy);
}else if (mainSubjects.contains("器乐")) {
professionalScore2 = activeCurrentUserScore.getYybyqy();
professionalScore3 = yybyqy;
} else if (mainSubjects.contains("声乐")) {
professionalScore2 = activeCurrentUserScore.getYybysy() ;
professionalScore3 = yybysy;
}
if(activeCurrentUserScore.getYyjy()!=null){
professionalScore2 = professionalScore2 == null ? activeCurrentUserScore.getYyjy() : professionalScore2.max(activeCurrentUserScore.getYyjy());
professionalScore3 = professionalScore3 == null ? yyjy : professionalScore3.max(yyjy);
}
}
}
} else {