|
@@ -15,9 +15,7 @@ import com.template.model.request.insertSmartGradeRequest;
|
|
|
import com.template.model.request.updateSmartGradeRequest;
|
|
import com.template.model.request.updateSmartGradeRequest;
|
|
|
import com.template.model.result.CommonResult;
|
|
import com.template.model.result.CommonResult;
|
|
|
import com.template.model.result.PageUtils;
|
|
import com.template.model.result.PageUtils;
|
|
|
-import com.template.model.vo.BsGradeNoVo;
|
|
|
|
|
-import com.template.model.vo.BsGradeVo;
|
|
|
|
|
-import com.template.model.vo.SemesterVo;
|
|
|
|
|
|
|
+import com.template.model.vo.*;
|
|
|
import com.template.services.SmartClassService;
|
|
import com.template.services.SmartClassService;
|
|
|
import com.template.services.SmartGradeService;
|
|
import com.template.services.SmartGradeService;
|
|
|
import com.template.services.SmartSubjectService;
|
|
import com.template.services.SmartSubjectService;
|
|
@@ -286,5 +284,33 @@ public class SmartGradeController implements SmartGradeControllerAPI {
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ @Override
|
|
|
|
|
+ @DESRespondSecret(validated = true)
|
|
|
|
|
+ public CommonResult getGradeAndClass() {
|
|
|
|
|
+ List<SmartGrade> grades = smartGradeService.list(null);
|
|
|
|
|
+ List<SmartClass> classes = smartClassService.list(null);
|
|
|
|
|
+
|
|
|
|
|
+ List<SubjectGradeVo> subjectVos = new ArrayList<>();
|
|
|
|
|
+ for (SmartGrade grade : grades) {
|
|
|
|
|
+ SubjectGradeVo subjectGradeVo = new SubjectGradeVo();
|
|
|
|
|
+ subjectGradeVo.setId(grade.getId());
|
|
|
|
|
+ subjectGradeVo.setName(grade.getName());
|
|
|
|
|
+ List<SubjectClassVo> classVos=new ArrayList<>();
|
|
|
|
|
+ List<SmartClass> ownerClasses = classes.stream().filter(e -> e.getGradeId().equals(grade.getId())).collect(Collectors.toList());
|
|
|
|
|
+ if(ownerClasses != null && ownerClasses.size() > 0){
|
|
|
|
|
+ for (SmartClass ownerClass :ownerClasses){
|
|
|
|
|
+ SubjectClassVo classVo = new SubjectClassVo();
|
|
|
|
|
+ classVo.setId(ownerClass.getId());
|
|
|
|
|
+ classVo.setName(ownerClass.getName());
|
|
|
|
|
+ classVos.add(classVo);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ subjectGradeVo.setChildren(classVos);
|
|
|
|
|
+ subjectVos.add(subjectGradeVo);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ return CommonResult.ok(subjectVos);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
|
|
|