updates
This commit is contained in:
parent
4fc2127be3
commit
2bfb2d5264
|
|
@ -117,8 +117,8 @@ public class YxHistoryMajorEnrollServiceImpl extends ServiceImpl<YxHistoryMajorE
|
||||||
key2+= h.getMajorType();
|
key2+= h.getMajorType();
|
||||||
|
|
||||||
if ("表演类".equals(h.getMajorType())) {
|
if ("表演类".equals(h.getMajorType())) {
|
||||||
key = h.getMajorTypeChild() + "_";
|
key = h.getMajorTypeChild();
|
||||||
key = key + "-" + h.getMajorTypeChild();
|
key2 = key2 +"-"+ h.getMajorTypeChild();
|
||||||
}else if ("音乐类".equals(h.getMajorType())) {
|
}else if ("音乐类".equals(h.getMajorType())) {
|
||||||
key = h.getMajorTypeChild();
|
key = h.getMajorTypeChild();
|
||||||
key2 = key2 +"-"+ h.getMajorTypeChild();
|
key2 = key2 +"-"+ h.getMajorTypeChild();
|
||||||
|
|
@ -146,7 +146,7 @@ public class YxHistoryMajorEnrollServiceImpl extends ServiceImpl<YxHistoryMajorE
|
||||||
for (String year : historyYearsList) {
|
for (String year : historyYearsList) {
|
||||||
key = "";
|
key = "";
|
||||||
if ("表演类".equals(recommendMajorDTO.getMajorType())) {
|
if ("表演类".equals(recommendMajorDTO.getMajorType())) {
|
||||||
key = recommendMajorDTO.getMajorTypeChild() + "_";
|
key = recommendMajorDTO.getMajorTypeChild();
|
||||||
}else if ("音乐类".equals(recommendMajorDTO.getMajorType())) {
|
}else if ("音乐类".equals(recommendMajorDTO.getMajorType())) {
|
||||||
key = recommendMajorDTO.getMajorTypeChild();
|
key = recommendMajorDTO.getMajorTypeChild();
|
||||||
if (!"音乐教育".equals(recommendMajorDTO.getMajorTypeChild())) {
|
if (!"音乐教育".equals(recommendMajorDTO.getMajorTypeChild())) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue