1、swagger接口文档

web/src/main/java/com/ibeetl/jlw/dao/SchoolClassDao.java

@@ -34,4 +34,7 @@ public interface SchoolClassDao extends BaseMapper<SchoolClass> {
     List<String> getAllSchoolClass(Long orgId);
 
     List<Map<String,Object>> getClassesByOrgId(Long orgId);
+
+
+    List<Map<String,Object>> getClassListByMajorId(String majorId);
 }

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<SchoolClass>{
+public class SchoolClassService extends CoreBaseService<SchoolClass> {
 
-    @Autowired private SchoolClassDao schoolClassDao;
+    @Autowired
+    private SchoolClassDao schoolClassDao;
     @Autowired
     @Lazy
     private UniversitiesCollegesService universitiesCollegesService;
 
-    public PageQuery<SchoolClass>queryByCondition(PageQuery query){
+    public PageQuery<SchoolClass> queryByCondition(PageQuery query) {
-        PageQuery ret =  schoolClassDao.queryByCondition(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<SchoolClass>{
         }
     }
 
-    public List<SchoolClass> getValues (Object paras){
+    public List<SchoolClass> getValues(Object paras) {
-        return sqlManager.select(SqlId.of("jlw.schoolClass.getSchoolClassValues"),SchoolClass.class,paras);
+        return sqlManager.select(SqlId.of("jlw.schoolClass.getSchoolClassValues"), SchoolClass.class, paras);
     }
 
-    public List<SchoolClass> getValuesByQuery (SchoolClassQuery schoolClassQuery){
+    public List<SchoolClass> getValuesByQuery(SchoolClassQuery schoolClassQuery) {
         return schoolClassDao.getValuesByQuery(schoolClassQuery);
     }
-    public List<SchoolClass> getValuesByQueryNotWithPermission (SchoolClassQuery schoolClassQuery){
+
+    public List<SchoolClass> 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<SchoolClass>{
 
     /**
      * 验证班级编号数据，是否已经存在
+     *
      * @param classList
      */
     public void validateClassSnListIsExistsThrow(List<SchoolClass> classList, String orgIds) {
@@ -113,7 +117,7 @@ public class SchoolClassService extends CoreBaseService<SchoolClass>{
                         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<SchoolClass>{
 
     /**
      * 没有传递机构ID的验证方法
+     *
      * @param classList
      */
     public void validateClassSnListIsExistsThrow(List<SchoolClass> classList) {
@@ -149,12 +154,13 @@ public class SchoolClassService extends CoreBaseService<SchoolClass>{
         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<SchoolClass>{
 
     /**
      * 构建一个确保全局唯一的班级编号
+     *
      * @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<SchoolClass>{
         // 中文的部分取拼音首字母
         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<SchoolClass>{
     }
 
 
-    public List<Map<String,Object>> findClassByOrgId(Long orgId) {
+    public List<Map<String, Object>> findClassByOrgId(Long orgId) {
         return schoolClassDao.getClassesByOrgId(orgId);
     }
+
+    public List<Map<String, Object>> getClassListByMajorId(String majorId) {
+        return schoolClassDao.getClassListByMajorId(majorId);
+    }
 }

web/src/main/java/com/ibeetl/jlw/web/AccountController.java

@@ -790,4 +790,10 @@ public class AccountController {
     public JsonResult<List<Map<String, Object>>> getStudentsByClassId(String classList) {
         return JsonResult.success(studentService.getStudentInfoByClassId(classList));
     }
+
+    @ApiOperation("根据专业id获取班级列表")
+    @GetMapping("getClassListByMajorId.json")
+    public JsonResult<List<Map<String,Object>>> getClassListByMajorId(String majorId){
+         return JsonResult.success(schoolClassService.getClassListByMajorId(majorId));
+    }
 }