class id 不允许null
This commit is contained in:
@@ -8,6 +8,7 @@ import com.yunhai.bschclassmanage.model.vo.SelectIntVO;
|
|||||||
import com.yunhai.bschclassmanage.service.IBaseSchsystemGradeService;
|
import com.yunhai.bschclassmanage.service.IBaseSchsystemGradeService;
|
||||||
import com.yunhai.bschclassmanage.service.IStudentClassHistoryService;
|
import com.yunhai.bschclassmanage.service.IStudentClassHistoryService;
|
||||||
import com.yunhai.bschclassmanage.utils.UserContext;
|
import com.yunhai.bschclassmanage.utils.UserContext;
|
||||||
|
import com.yunhai.platform.utils.exception.DException;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
@@ -24,25 +25,37 @@ public class SchHistoryController {
|
|||||||
private IStudentClassHistoryService studentClassHistoryService; // 使用接口
|
private IStudentClassHistoryService studentClassHistoryService; // 使用接口
|
||||||
|
|
||||||
@GetMapping("getClass")
|
@GetMapping("getClass")
|
||||||
public HistorySchClassVO GetClassFirst(int classId) {
|
public HistorySchClassVO GetClassFirst(Integer classId) {
|
||||||
|
if (classId == null || classId <= 0) {
|
||||||
|
throw new DException("班级ID不允许为空");
|
||||||
|
}
|
||||||
return studentClassHistoryService.GetClassFirst(UserContext.getSchId(),classId);
|
return studentClassHistoryService.GetClassFirst(UserContext.getSchId(),classId);
|
||||||
}
|
}
|
||||||
|
|
||||||
//获取历史学生信息(逐年倒序)
|
//获取历史学生信息(逐年倒序)
|
||||||
@GetMapping("getHistoryClassStudent")
|
@GetMapping("getHistoryClassStudent")
|
||||||
public List<HistorySchStudentVO> getHistoryClassStudent(int classId) {
|
public List<HistorySchStudentVO> getHistoryClassStudent(Integer classId) {
|
||||||
|
if (classId == null || classId <= 0) {
|
||||||
|
throw new DException("班级ID不允许为空");
|
||||||
|
}
|
||||||
return studentClassHistoryService.getHistoryClassStudent(UserContext.getSchId(),classId);
|
return studentClassHistoryService.getHistoryClassStudent(UserContext.getSchId(),classId);
|
||||||
}
|
}
|
||||||
|
|
||||||
//获取历史任教信息
|
//获取历史任教信息
|
||||||
@GetMapping("getHistoryClassTeach")
|
@GetMapping("getHistoryClassTeach")
|
||||||
public List<HistoryClassTeachVO> getHistoryClassTeach(int classId) {
|
public List<HistoryClassTeachVO> getHistoryClassTeach(Integer classId) {
|
||||||
|
if (classId == null || classId <= 0) {
|
||||||
|
throw new DException("班级ID不允许为空");
|
||||||
|
}
|
||||||
return studentClassHistoryService.getHistoryClassTeach(UserContext.getSchId(),classId);
|
return studentClassHistoryService.getHistoryClassTeach(UserContext.getSchId(),classId);
|
||||||
}
|
}
|
||||||
|
|
||||||
//通过学生stuId获取历史任教信息
|
//通过学生stuId获取历史任教信息
|
||||||
@GetMapping("getHistoryClassTeachByStuId")
|
@GetMapping("getHistoryClassTeachByStuId")
|
||||||
public Map<String, Object> getHistoryClassTeachByStuId(int stuId) {
|
public Map<String, Object> getHistoryClassTeachByStuId(Integer stuId) {
|
||||||
|
if (stuId == null || stuId <= 0) {
|
||||||
|
throw new DException("学生ID不允许为空");
|
||||||
|
}
|
||||||
return studentClassHistoryService.getHistoryClassTeachByStuId(UserContext.getSchId(),stuId);
|
return studentClassHistoryService.getHistoryClassTeachByStuId(UserContext.getSchId(),stuId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -96,6 +96,9 @@ public class StudentClassHistoryService implements IStudentClassHistoryService {
|
|||||||
|
|
||||||
|
|
||||||
public HistorySchClassVO GetClassFirst(Integer schId,Integer classId) {
|
public HistorySchClassVO GetClassFirst(Integer schId,Integer classId) {
|
||||||
|
if (classId == null || classId <= 0) {
|
||||||
|
throw new DException("班级ID不允许为空");
|
||||||
|
}
|
||||||
Integer schType=schBinSchsystemService.getSchType(schId);
|
Integer schType=schBinSchsystemService.getSchType(schId);
|
||||||
Integer gradeId=null;
|
Integer gradeId=null;
|
||||||
Optional<SchClass> classInfo= schClassService.getSchAllClassCacheFilter(schId,gradeId,classId).stream().findFirst();
|
Optional<SchClass> classInfo= schClassService.getSchAllClassCacheFilter(schId,gradeId,classId).stream().findFirst();
|
||||||
|
|||||||
Reference in New Issue
Block a user