|
@@ -149,8 +149,8 @@ public class BBusiWishUniversitiesServiceImpl implements IBBusiWishUniversitiesS
|
|
|
data.setBaseInfo(selectBBusiWishUniversitiesByCode(code));
|
|
data.setBaseInfo(selectBBusiWishUniversitiesByCode(code));
|
|
|
|
|
|
|
|
//院校院系 b_busi_wish_universities_department;院校院系专业 b_busi_wish_universities_department_major
|
|
//院校院系 b_busi_wish_universities_department;院校院系专业 b_busi_wish_universities_department_major
|
|
|
-// List<BBusiWishUniversitiesDepartment> departmentList=universitiesDepartmentMapper.selectBBusiWishUniversitiesDepartmentList(new BBusiWishUniversitiesDepartment().setCollegeCode(code));
|
|
|
|
|
-// data.setDepartments(departmentList);
|
|
|
|
|
|
|
+ List<BBusiWishUniversitiesDepartment> departmentList=universitiesDepartmentMapper.selectBBusiWishUniversitiesDepartmentList(new BBusiWishUniversitiesDepartment().setCollegeCode(code));
|
|
|
|
|
+ data.setDepartments(departmentList);
|
|
|
|
|
|
|
|
//院校特色专业 b_busi_wish_universities_profession
|
|
//院校特色专业 b_busi_wish_universities_profession
|
|
|
SysUser u = SecurityUtils.getLoginUser().getUser();
|
|
SysUser u = SecurityUtils.getLoginUser().getUser();
|
|
@@ -162,7 +162,7 @@ public class BBusiWishUniversitiesServiceImpl implements IBBusiWishUniversitiesS
|
|
|
cond.put("examType", examTypeData);
|
|
cond.put("examType", examTypeData);
|
|
|
cond.put("examMajor", u.getExamMajor());
|
|
cond.put("examMajor", u.getExamMajor());
|
|
|
|
|
|
|
|
- /**
|
|
|
|
|
|
|
+ /****/
|
|
|
List<BBusiWishUniversitiesProfession> professionList = universitiesProfessionMapper.selectEnrollPlanProfessionByCode(cond);
|
|
List<BBusiWishUniversitiesProfession> professionList = universitiesProfessionMapper.selectEnrollPlanProfessionByCode(cond);
|
|
|
//设置数量
|
|
//设置数量
|
|
|
Map<String,Integer> codeCountMap = syMajorService.selectSyMajorByLevel(examTypeData, 3).stream().collect(Collectors.toMap(t -> t.getCode(), SyMajor::getChildCount));
|
|
Map<String,Integer> codeCountMap = syMajorService.selectSyMajorByLevel(examTypeData, 3).stream().collect(Collectors.toMap(t -> t.getCode(), SyMajor::getChildCount));
|
|
@@ -172,7 +172,7 @@ public class BBusiWishUniversitiesServiceImpl implements IBBusiWishUniversitiesS
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
data.setProfessions(professionList);
|
|
data.setProfessions(professionList);
|
|
|
- **/
|
|
|
|
|
|
|
+
|
|
|
|
|
|
|
|
//院校重点&双一流 b_busi_wish_universities_subject
|
|
//院校重点&双一流 b_busi_wish_universities_subject
|
|
|
// Map<String,List<BBusiWishUniversitiesSubject>> subjectMap = universitiesSubjectMapper.selectBBusiWishUniversitiesSubjectList(new BBusiWishUniversitiesSubject().setCollegeCode(code)).stream().collect(Collectors.groupingBy(entity -> entity.getDataType()));
|
|
// Map<String,List<BBusiWishUniversitiesSubject>> subjectMap = universitiesSubjectMapper.selectBBusiWishUniversitiesSubjectList(new BBusiWishUniversitiesSubject().setCollegeCode(code)).stream().collect(Collectors.groupingBy(entity -> entity.getDataType()));
|