qqq
This commit is contained in:
+12
-14
@@ -11,12 +11,10 @@ import com.yunhai.bschclassmanage.model.dto.SchCustomGroupDTO;
|
||||
import com.yunhai.bschclassmanage.model.dto.SetLeaderDTO;
|
||||
import com.yunhai.bschclassmanage.model.excel.CustomGroupExcelColumn;
|
||||
import com.yunhai.bschclassmanage.model.excel.ImportRuleExcelColumn;
|
||||
import com.yunhai.bschclassmanage.model.tool.UserSysRole;
|
||||
import com.yunhai.bschclassmanage.model.vo.SchCustomGroupVO;
|
||||
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.web.bind.annotation.*;
|
||||
@@ -52,28 +50,28 @@ public class SchCustomGroupController {
|
||||
private ISchTeacherService schTeacherService;
|
||||
|
||||
@GetMapping("getSchCustomGroup")
|
||||
public List<SchCustomGroupVO> getSchCustomGroup(UserSysRole curRole, @RequestParam Integer type) {
|
||||
return schCustomGroupService.getSchCustomGroup(curRole.getSchId(),type);
|
||||
public List<SchCustomGroupVO> getSchCustomGroup(@RequestParam Integer type) {
|
||||
return schCustomGroupService.getSchCustomGroup(UserContext.getSchId(),type);
|
||||
}
|
||||
|
||||
@PostMapping("saveSchCustomGroup")
|
||||
public void saveSchCustomGroup(BoaUser authUserWithDept, UserSysRole curRole, @Valid @RequestBody SchCustomGroupDTO dto) {
|
||||
schCustomGroupService.saveSchCustomGroup(UserContext.getCurrentUserInfo(),dto);
|
||||
public void saveSchCustomGroup(@Valid @RequestBody SchCustomGroupDTO dto) {
|
||||
schCustomGroupService.saveSchCustomGroup(UserContext.getCurrentUser(),dto);
|
||||
}
|
||||
|
||||
@PostMapping("saveMembers")
|
||||
public void saveMembers(BoaUser authUserWithDept, UserSysRole curRole,@Valid @RequestBody AddMemberDTO dto) {
|
||||
schCustomGroupService.saveMembers(UserContext.getCurrentUserInfo(),dto);
|
||||
public void saveMembers(@Valid @RequestBody AddMemberDTO dto) {
|
||||
schCustomGroupService.saveMembers(UserContext.getCurrentUser(),dto);
|
||||
}
|
||||
|
||||
@PostMapping("setLeaders")
|
||||
public void setLeaders(BoaUser authUserWithDept, UserSysRole curRole,@Valid @RequestBody SetLeaderDTO dto) {
|
||||
schCustomGroupService.setLeaders(UserContext.getCurrentUserInfo(),dto);
|
||||
public void setLeaders(@Valid @RequestBody SetLeaderDTO dto) {
|
||||
schCustomGroupService.setLeaders(UserContext.getCurrentUser(),dto);
|
||||
}
|
||||
|
||||
@PostMapping("deleteSchCustomGroup")
|
||||
public void deleteSchCustomGroup(UserSysRole curRole,@RequestParam Integer groupId) {
|
||||
schCustomGroupService.deleteSchCustomGroup(UserContext.getCurrentUserInfo(),groupId);
|
||||
public void deleteSchCustomGroup(@RequestParam Integer groupId) {
|
||||
schCustomGroupService.deleteSchCustomGroup(UserContext.getCurrentUser(),groupId);
|
||||
}
|
||||
|
||||
|
||||
@@ -155,7 +153,7 @@ public class SchCustomGroupController {
|
||||
|
||||
|
||||
@PostMapping("importCustomGroup")
|
||||
public void importCustomGroup(BoaUser authUserWithDept, UserSysRole curRole, @RequestPart("file") MultipartFile file) {
|
||||
schCustomGroupService.importCustomGroup(UserContext.getCurrentUserInfo(),file);
|
||||
public void importCustomGroup(@RequestPart("file") MultipartFile file) {
|
||||
schCustomGroupService.importCustomGroup(UserContext.getCurrentUser(),file);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user