diff --git a/web/src/main/java/com/ibeetl/jlw/dao/SchoolClassDao.java b/web/src/main/java/com/ibeetl/jlw/dao/SchoolClassDao.java index 91f3f617..41f9e163 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/SchoolClassDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/SchoolClassDao.java @@ -34,4 +34,7 @@ public interface SchoolClassDao extends BaseMapper { List getAllSchoolClass(Long orgId); List> getClassesByOrgId(Long orgId); + + + List> getClassListByMajorId(String majorId); } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/service/SchoolClassService.java b/web/src/main/java/com/ibeetl/jlw/service/SchoolClassService.java index 9e3afcb5..bc7fa8fd 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/SchoolClassService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/SchoolClassService.java @@ -36,20 +36,21 @@ import static com.ibeetl.admin.core.util.ListUtils.getDuplicateElements; @Service @Transactional -public class SchoolClassService extends CoreBaseService{ +public class SchoolClassService extends CoreBaseService { - @Autowired private SchoolClassDao schoolClassDao; + @Autowired + private SchoolClassDao schoolClassDao; @Autowired @Lazy private UniversitiesCollegesService universitiesCollegesService; - public PageQueryqueryByCondition(PageQuery query){ - PageQuery ret = schoolClassDao.queryByCondition(query); + public PageQuery queryByCondition(PageQuery query) { + PageQuery ret = schoolClassDao.queryByCondition(query); queryListAfter(ret.getList()); return ret; } - public void deleteSchoolClass(String ids){ + public void deleteSchoolClass(String ids) { try { schoolClassDao.deleteSchoolClassByIds(ids); } catch (Exception e) { @@ -57,20 +58,22 @@ public class SchoolClassService extends CoreBaseService{ } } - public List getValues (Object paras){ - return sqlManager.select(SqlId.of("jlw.schoolClass.getSchoolClassValues"),SchoolClass.class,paras); + public List getValues(Object paras) { + return sqlManager.select(SqlId.of("jlw.schoolClass.getSchoolClassValues"), SchoolClass.class, paras); } - public List getValuesByQuery (SchoolClassQuery schoolClassQuery){ + public List getValuesByQuery(SchoolClassQuery schoolClassQuery) { return schoolClassDao.getValuesByQuery(schoolClassQuery); } - public List getValuesByQueryNotWithPermission (SchoolClassQuery schoolClassQuery){ + + public List getValuesByQueryNotWithPermission(SchoolClassQuery schoolClassQuery) { return schoolClassDao.getValuesByQueryNotWithPermission(schoolClassQuery); } /** * 获取不重复的班级编号 - * @param prefix 自定义前缀 (非必传) + * + * @param prefix 自定义前缀 (非必传) * @return */ public String randomClassSn(String prefix) { @@ -85,6 +88,7 @@ public class SchoolClassService extends CoreBaseService{ /** * 验证班级编号数据,是否已经存在 + * * @param classList */ public void validateClassSnListIsExistsThrow(List classList, String orgIds) { @@ -113,7 +117,7 @@ public class SchoolClassService extends CoreBaseService{ return Arrays.asList(orgIds.split(",")); } }) - .andEq(SchoolClass::getClassStatus, 1).select(String.class,"class_sn"); + .andEq(SchoolClass::getClassStatus, 1).select(String.class, "class_sn"); // 如果存在的话,属于异常数据 String errorClassSns = CollectionUtil.emptyIfNull(existsList).stream().collect(Collectors.joining(",")); // 构建异常信息,传给前端 @@ -122,6 +126,7 @@ public class SchoolClassService extends CoreBaseService{ /** * 没有传递机构ID的验证方法 + * * @param classList */ public void validateClassSnListIsExistsThrow(List classList) { @@ -149,12 +154,13 @@ public class SchoolClassService extends CoreBaseService{ return getFirst(getValuesByQueryNotWithPermission(query)); } - public SchoolClass getByName (String name){ + public SchoolClass getByName(String name) { return getByName(name, null); } /** * 通过名称查询数据,没有查询到的话,则插入数据,并返回给前端这条插入的数据 + * * @param name * @param orgId * @return @@ -188,12 +194,13 @@ public class SchoolClassService extends CoreBaseService{ /** * 构建一个确保全局唯一的班级编号 + * * @return */ - public String buildClassSnEnsureUnique(@NotNull(message = "院校不能为空!") UniversitiesColleges universitiesColleges, @NotNull(message = "班级名称不能为空!") String className) { + public String buildClassSnEnsureUnique(@NotNull(message = "院校不能为空!") UniversitiesColleges universitiesColleges, @NotNull(message = "班级名称不能为空!") String className) { // 左侧的名称 - String leftName = universitiesColleges != null ? universitiesColleges.getUniversitiesCollegesName() : ( RandomUtil.randomInt(6) + "" ); + String leftName = universitiesColleges != null ? universitiesColleges.getUniversitiesCollegesName() : (RandomUtil.randomInt(6) + ""); // 初步生成的班级编号 String classSnBefore = StrUtil.format("{}_{}_{}", leftName, replaceAllByClassNameRule(className), RandomUtil.randomNumbers(6)); @@ -201,7 +208,7 @@ public class SchoolClassService extends CoreBaseService{ // 中文的部分取拼音首字母 String classSnPinyin = PinyinUtil.getFirstLetter(classSnBefore, ""); - if(countByClassSn(classSnPinyin) > 0L) { + if (countByClassSn(classSnPinyin) > 0L) { return buildClassSnEnsureUnique(universitiesColleges, className); } @@ -245,7 +252,11 @@ public class SchoolClassService extends CoreBaseService{ } - public List> findClassByOrgId(Long orgId) { + public List> findClassByOrgId(Long orgId) { return schoolClassDao.getClassesByOrgId(orgId); } + + public List> getClassListByMajorId(String majorId) { + return schoolClassDao.getClassListByMajorId(majorId); + } } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/web/AccountController.java b/web/src/main/java/com/ibeetl/jlw/web/AccountController.java index f3accdd4..5de777b1 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/AccountController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/AccountController.java @@ -790,4 +790,10 @@ public class AccountController { public JsonResult>> getStudentsByClassId(String classList) { return JsonResult.success(studentService.getStudentInfoByClassId(classList)); } + + @ApiOperation("根据专业id获取班级列表") + @GetMapping("getClassListByMajorId.json") + public JsonResult>> getClassListByMajorId(String majorId){ + return JsonResult.success(schoolClassService.getClassListByMajorId(majorId)); + } }