This commit is contained in:
2026-08-13 16:53:39 +08:00
parent 5210ad34f3
commit ed48da0a78
27 changed files with 392 additions and 313 deletions
@@ -9,7 +9,6 @@ import com.yunhai.bschclassmanage.entity.SchClass;
import com.yunhai.bschclassmanage.model.excel.ImportRuleExcelColumn;
import com.yunhai.bschclassmanage.model.excel.SchClassExcelColumn;
import com.yunhai.bschclassmanage.model.excel.SchHeightClassExcelColumn;
import com.yunhai.bschclassmanage.model.tool.UserSysRole;
import com.yunhai.bschclassmanage.model.vo.BaseSchClassVO;
import com.yunhai.bschclassmanage.model.vo.HigherSchClassVO;
import com.yunhai.bschclassmanage.model.vo.PageVO;
@@ -17,7 +16,6 @@ import com.yunhai.bschclassmanage.model.vo.SelectIntVO;
import com.yunhai.bschclassmanage.service.*;
import com.yunhai.bschclassmanage.utils.EasyPoiUtils;
import com.yunhai.bschclassmanage.utils.UserContext;
import com.yunhai.platform.utils.model.BoaUser;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
@@ -61,64 +59,62 @@ public class SchClassController {
@GetMapping("searcBaseSchClass")
public List<BaseSchClassVO> searcBaseSchClass(UserSysRole curRole,
@RequestParam(required = false) Integer schsystemId,
public List<BaseSchClassVO> searcBaseSchClass(@RequestParam(required = false) Integer schsystemId,
@RequestParam(required = false) Integer gradeId) {
return schClassService.searcBaseSchClass(curRole.getSchId(),schsystemId,gradeId,null);
return schClassService.searcBaseSchClass(UserContext.getSchId(),schsystemId,gradeId,null);
}
@PostMapping("addBaseSchClass")
public void addBaseSchClass(BoaUser authUserWithDept, UserSysRole curRole, Integer gradeId, Integer number) {
schClassService.addBaseSchClass(UserContext.getCurrentUserInfo(),gradeId,number);
public void addBaseSchClass(Integer gradeId, Integer number) {
schClassService.addBaseSchClass(UserContext.getCurrentUser(),gradeId,number);
}
@PostMapping("editClassName")
public void editClassName(BoaUser authUserWithDept, UserSysRole curRole,Integer id,String cname) {
schClassService.editClassName(UserContext.getCurrentUserInfo(),id,cname);
public void editClassName(Integer id,String cname) {
schClassService.editClassName(UserContext.getCurrentUser(),id,cname);
}
@PostMapping("editClassFirstTeacher")
public void editClassfirstTeacher(BoaUser authUserWithDept, UserSysRole curRole,Integer id,Integer firstTeacherId) {
schClassService.editClassFirstTeacher(UserContext.getCurrentUserInfo(),id,firstTeacherId);
public void editClassfirstTeacher(Integer id,Integer firstTeacherId) {
schClassService.editClassFirstTeacher(UserContext.getCurrentUser(),id,firstTeacherId);
}
@PostMapping("editClassSecondTeacher")
public void editClassSecondTeacher(BoaUser authUserWithDept, UserSysRole curRole,Integer id,Integer secondTeacherId) {
schClassService.editClassSecondTeacher(UserContext.getCurrentUserInfo(),id,secondTeacherId);
public void editClassSecondTeacher(Integer id,Integer secondTeacherId) {
schClassService.editClassSecondTeacher(UserContext.getCurrentUser(),id,secondTeacherId);
}
@PostMapping("editClassCampus")
public void editClassCampus(BoaUser authUserWithDept, UserSysRole curRole,Integer id,Integer campusId) {
schClassService.editClassCampus(UserContext.getCurrentUserInfo(),id,campusId);
public void editClassCampus(Integer id,Integer campusId) {
schClassService.editClassCampus(UserContext.getCurrentUser(),id,campusId);
}
@GetMapping("searcHigherSchClass")
public PageVO<HigherSchClassVO> searcHigherSchClass(UserSysRole curRole,
@RequestParam(required = false) Integer year,
public PageVO<HigherSchClassVO> searcHigherSchClass(@RequestParam(required = false) Integer year,
@RequestParam(required = false) Integer campusId,
@RequestParam(required = false) Integer divisionId,
@RequestParam(required = false) Integer majorsId,
Pageable pageable) {
return schClassService.searcHigherSchClass(curRole.getSchId(),year,campusId,divisionId,majorsId,pageable);
return schClassService.searcHigherSchClass(UserContext.getSchId(),year,campusId,divisionId,majorsId,pageable);
}
@PostMapping("saveHigherSchClass")
public void addHigherSchClass(BoaUser authUserWithDept, UserSysRole curRole,@RequestBody SchClass model) {
schClassService.saveHigherSchClass(UserContext.getCurrentUserInfo(),model);
public void addHigherSchClass(@RequestBody SchClass model) {
schClassService.saveHigherSchClass(UserContext.getCurrentUser(),model);
}
@PostMapping("delete/{id}")
public void deleteSchClass(BoaUser authUserWithDept, UserSysRole curRole,@PathVariable Integer id) {
schClassService.deleteSchClass(UserContext.getCurrentUserInfo(),id,curRole.getSchId());
public void deleteSchClass(@PathVariable Integer id) {
schClassService.deleteSchClass(UserContext.getCurrentUser(),id,UserContext.getSchId());
}
@GetMapping("select")
public List<SelectIntVO> getClassSelect(UserSysRole curRole, @RequestParam Integer gradeId) {
return schClassService.getClassSelect(curRole.getSchId(),gradeId);
public List<SelectIntVO> getClassSelect(@RequestParam Integer gradeId) {
return schClassService.getClassSelect(UserContext.getSchId(),gradeId);
}
@GetMapping("selectBySchIdAndGradeId")
@@ -187,8 +183,8 @@ public class SchClassController {
}
@PostMapping("importClasses")
public void importClasses(BoaUser authUserWithDept, UserSysRole curRole, @RequestPart("file") MultipartFile file) {
schClassService.importClasses(UserContext.getCurrentUserInfo(),file);
public void importClasses(@RequestPart("file") MultipartFile file) {
schClassService.importClasses(UserContext.getCurrentUser(),file);
}
@@ -206,7 +202,7 @@ public class SchClassController {
column.setClazzCName("");
column.setCampus("示例:南校区");
column.setDivistion("示例:信息工程");
column.setDivistion("示例:软件开发");
column.setMajors("示例:软件开发");
column.setBzr("示例:张三");
classList.add(column);
}
@@ -267,8 +263,8 @@ public class SchClassController {
}
@PostMapping("importHeightClasses")
public void importHeightClasses(BoaUser authUserWithDept, UserSysRole curRole, @RequestPart("file") MultipartFile file) {
schClassService.importHeightClasses(UserContext.getCurrentUserInfo(),file);
public void importHeightClasses(@RequestPart("file") MultipartFile file) {
schClassService.importHeightClasses(UserContext.getCurrentUser(),file);
}
@GetMapping("backupAllSnapshot")