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-06-25 07:22:18 +08:00
parent 8ab52ce68c
commit 49c09dae61
3 changed files with 8 additions and 4 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/MiniMajorController.java
View File

@ -114,6 +114,7 @@ public class MiniMajorController {
dataList = JSONArray.parseArray(json, Map.class); dataList = JSONArray.parseArray(json, Map.class);
} else { } else {
String str = null; String str = null;
List<String> notList= Arrays.asList("文7专3","专过文排","文8专2","文6专4","文5专5");
if (queryRecommendMajorVO.getProfessionalCategory().equals("音乐类")) { if (queryRecommendMajorVO.getProfessionalCategory().equals("音乐类")) {
str = "[\"文过专排主科\",\"文过专排\",\"专过文排\",\"文1专1\",\"文3专7\",\"文3专10\",\"文4专10\",\"文4专6\",\"文5专10\",\"文5专5\",\"文6专10\",\"文6专4\",\"文7专3\"]"; str = "[\"文过专排主科\",\"文过专排\",\"专过文排\",\"文1专1\",\"文3专7\",\"文3专10\",\"文4专10\",\"文4专6\",\"文5专10\",\"文5专5\",\"文6专10\",\"文6专4\",\"文7专3\"]";
} else if (queryRecommendMajorVO.getProfessionalCategory().equals("体育类")) { } else if (queryRecommendMajorVO.getProfessionalCategory().equals("体育类")) {
@ -125,10 +126,12 @@ public class MiniMajorController {
List<String> javaList = objects.toJavaList(String.class); List<String> javaList = objects.toJavaList(String.class);
for (String s : javaList) { for (String s : javaList) {
data = new LinkedHashMap<>(); data = new LinkedHashMap<>();
if (notList.contains(s)) {
data.put("label", s); data.put("label", s);
data.put("value", s); data.put("value", s);
dataList.add(data); dataList.add(data);
} }
}
json = JSONObject.toJSONString(dataList); json = JSONObject.toJSONString(dataList);
redisUtil.set(key, json, 3600); redisUtil.set(key, json, 3600);
} }

1
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMajorMapper.xml
View File

@ -13,6 +13,7 @@
m.major_desc as majorRemarks, m.major_desc as majorRemarks,
sm.semester as studyYear, sm.semester as studyYear,
sm.limitation, sm.limitation,
sm.state,
sm.major_name, sm.major_name,
sm.major_type, sm.major_type,
sm.major_type_child, sm.major_type_child,

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

@ -133,7 +133,7 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
pageSize = 5; pageSize = 5;
} }
//获取当前分数 //获取当前分数
YxUserScore activeCurrentUserScore = yxUserScoreService.getActiveCurrentUserScore();; YxUserScore activeCurrentUserScore = yxUserScoreService.getActiveCurrentUserScore();
// if (StringUtils.isNotBlank(queryRecommendMajorVO.getScoreId())) { // if (StringUtils.isNotBlank(queryRecommendMajorVO.getScoreId())) {
// //是根据成绩单来的 // //是根据成绩单来的
// activeCurrentUserScore = yxUserScoreService.findById(queryRecommendMajorVO.getScoreId()); // activeCurrentUserScore = yxUserScoreService.findById(queryRecommendMajorVO.getScoreId());