修改班会材料搜索
This commit is contained in:
@@ -85,32 +85,31 @@ public class RtClassMettingContentController extends BaseController {
|
||||
|
||||
@GetMapping("/listStu")
|
||||
@ApiOperation("学生查询辅导员班会内容列表")
|
||||
public TableDataInfo listStu(RtClassMettingContent rtClassMettingContent)
|
||||
{
|
||||
List<Map< String, Object >> list1 = rtClassMettingStuUploadService.listStuClass(getUsername());
|
||||
if(list1.size() == 0){
|
||||
throw new RuntimeException("未查询到您的学生信息,请联系管理员");
|
||||
public TableDataInfo listStu(RtClassMettingContent rtClassMettingContent) {
|
||||
List<Map<String, Object>> list1 = rtClassMettingStuUploadService.listStuClass(getUsername());
|
||||
if (list1.size() == 0) {
|
||||
throw new RuntimeException("未查询到您的学生信息,请联系管理员");
|
||||
}
|
||||
QueryWrapper<SrsStudent> studentQueryWrapper = new QueryWrapper<>();
|
||||
studentQueryWrapper.eq("stu_no", getUsername());
|
||||
studentQueryWrapper.last("limit 1");
|
||||
SrsStudent student=_stuMapper.selectOne(studentQueryWrapper);
|
||||
if(student==null){
|
||||
return getDataTable(new ArrayList<Map< String, Object >>());
|
||||
SrsStudent student = _stuMapper.selectOne(studentQueryWrapper);
|
||||
if (student == null) {
|
||||
return getDataTable(new ArrayList<Map<String, Object>>());
|
||||
}
|
||||
Long classId=student.getClassId();
|
||||
if(classId==null){
|
||||
return getDataTable(new ArrayList<Map< String, Object >>());
|
||||
Long classId = student.getClassId();
|
||||
if (classId == null) {
|
||||
return getDataTable(new ArrayList<Map<String, Object>>());
|
||||
}
|
||||
SrsClass srsClass=_classMapper.selectSrsClassByClassId(classId);
|
||||
if(srsClass==null){
|
||||
return getDataTable(new ArrayList<Map< String, Object >>());
|
||||
SrsClass srsClass = _classMapper.selectSrsClassByClassId(classId);
|
||||
if (srsClass == null) {
|
||||
return getDataTable(new ArrayList<Map<String, Object>>());
|
||||
}
|
||||
Long teacherId=srsClass.getTeacherId();
|
||||
Long teacherId = srsClass.getTeacherId();
|
||||
|
||||
CphTeacher fdy = _fdyMapper.selectById(teacherId);
|
||||
if(fdy==null){
|
||||
return getDataTable(new ArrayList<Map< String, Object >>());
|
||||
if (fdy == null) {
|
||||
return getDataTable(new ArrayList<Map<String, Object>>());
|
||||
}
|
||||
rtClassMettingContent.setCrTeacherNo(fdy.getEmployeeId());
|
||||
startPage();
|
||||
@@ -122,8 +121,7 @@ public class RtClassMettingContentController extends BaseController {
|
||||
|
||||
@GetMapping("/listFdy")
|
||||
@ApiOperation("查询辅导员班会内容列表")
|
||||
public TableDataInfo listFdy(RtClassMettingContent rtClassMettingContent)
|
||||
{
|
||||
public TableDataInfo listFdy(RtClassMettingContent rtClassMettingContent) {
|
||||
rtClassMettingContent.setCrTeacherNo(getUsername());
|
||||
startPage();
|
||||
List<RtClassMettingContent> list = rtClassMettingContentService.selectRtClassMettingContentList(rtClassMettingContent);
|
||||
@@ -138,8 +136,7 @@ public class RtClassMettingContentController extends BaseController {
|
||||
//@PreAuthorize("@ss.hasPermi('classmetting:classMettingContent:list')")
|
||||
@GetMapping("/list")
|
||||
@ApiOperation("查询班会内容列表")
|
||||
public TableDataInfo list(RtClassMettingContent rtClassMettingContent)
|
||||
{
|
||||
public TableDataInfo list(RtClassMettingContent rtClassMettingContent) {
|
||||
startPage();
|
||||
List<RtClassMettingContent> list = rtClassMettingContentService.selectRtClassMettingContentList(rtClassMettingContent);
|
||||
//list.add(1);
|
||||
@@ -153,8 +150,7 @@ public class RtClassMettingContentController extends BaseController {
|
||||
@Log(title = "班会内容", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
@ApiOperation("导出班会内容列表")
|
||||
public void export(HttpServletResponse response, RtClassMettingContent rtClassMettingContent)
|
||||
{
|
||||
public void export(HttpServletResponse response, RtClassMettingContent rtClassMettingContent) {
|
||||
List<RtClassMettingContent> list = rtClassMettingContentService.selectRtClassMettingContentList(rtClassMettingContent);
|
||||
ExcelUtil<RtClassMettingContent> util = new ExcelUtil<RtClassMettingContent>(RtClassMettingContent.class);
|
||||
util.exportExcel(response, list, "班会内容数据");
|
||||
@@ -166,21 +162,19 @@ public class RtClassMettingContentController extends BaseController {
|
||||
//@PreAuthorize("@ss.hasPermi('classmetting:classMettingContent:query')")
|
||||
@GetMapping(value = "/{crId}")
|
||||
@ApiOperation("获取班会内容详细信息")
|
||||
public AjaxResult getInfo(@PathVariable("crId") Long crId)
|
||||
{
|
||||
public AjaxResult getInfo(@PathVariable("crId") Long crId) {
|
||||
return success(rtClassMettingContentService.selectRtClassMettingContentByCrId(crId));
|
||||
}
|
||||
|
||||
@Log(title = "班会内容", businessType = BusinessType.INSERT)
|
||||
@PostMapping("/stuAdd")
|
||||
@ApiOperation("学生新增班会内容")
|
||||
public AjaxResult stuAdd(@RequestBody RtClassMettingContent rtClassMettingContent)
|
||||
{
|
||||
List<Map< String, Object >> list = rtClassMettingStuUploadService.listStuClass(getUsername());
|
||||
if(list.size() == 0){
|
||||
throw new RuntimeException("您的班级为空,请联系管理员");
|
||||
public AjaxResult stuAdd(@RequestBody RtClassMettingContent rtClassMettingContent) {
|
||||
List<Map<String, Object>> list = rtClassMettingStuUploadService.listStuClass(getUsername());
|
||||
if (list.size() == 0) {
|
||||
throw new RuntimeException("您的班级为空,请联系管理员");
|
||||
}
|
||||
Map< String, Object > map = list.get(0);
|
||||
Map<String, Object> map = list.get(0);
|
||||
|
||||
rtClassMettingContent.setCrTeacherNo(map.get("t_no").toString());
|
||||
rtClassMettingContent.setCreateBy(getUsername());
|
||||
@@ -190,12 +184,11 @@ public class RtClassMettingContentController extends BaseController {
|
||||
/**
|
||||
* 新增班会内容
|
||||
*/
|
||||
// @PreAuthorize("@ss.hasPermi('classmetting:classMettingContent:add')")
|
||||
// @PreAuthorize("@ss.hasPermi('classmetting:classMettingContent:add')")
|
||||
@Log(title = "班会内容", businessType = BusinessType.INSERT)
|
||||
@PostMapping("/add")
|
||||
@ApiOperation("新增班会内容")
|
||||
public AjaxResult add(@RequestBody RtClassMettingContent rtClassMettingContent)
|
||||
{
|
||||
public AjaxResult add(@RequestBody RtClassMettingContent rtClassMettingContent) {
|
||||
rtClassMettingContent.setCrTeacherNo(getUsername());
|
||||
rtClassMettingContent.setCreateBy(getUsername());
|
||||
return rtClassMettingContentService.insertRtClassMettingContent(rtClassMettingContent);
|
||||
@@ -208,8 +201,7 @@ public class RtClassMettingContentController extends BaseController {
|
||||
@Log(title = "班会内容", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/update")
|
||||
@ApiOperation("修改班会内容")
|
||||
public AjaxResult edit(@RequestBody RtClassMettingContent rtClassMettingContent)
|
||||
{
|
||||
public AjaxResult edit(@RequestBody RtClassMettingContent rtClassMettingContent) {
|
||||
rtClassMettingContent.setUpdateBy(getUsername());
|
||||
return toAjax(rtClassMettingContentService.updateRtClassMettingContent(rtClassMettingContent));
|
||||
}
|
||||
@@ -221,8 +213,7 @@ public class RtClassMettingContentController extends BaseController {
|
||||
@Log(title = "班会内容", businessType = BusinessType.DELETE)
|
||||
@PostMapping("/{crIds}")
|
||||
@ApiOperation("删除班会内容")
|
||||
public AjaxResult remove(@PathVariable Long[] crIds)
|
||||
{
|
||||
public AjaxResult remove(@PathVariable Long[] crIds) {
|
||||
return toAjax(rtClassMettingContentService.deleteRtClassMettingContentByCrIds(crIds));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user