diff --git a/src/main/java/com/sztzjy/resource_center/controller/api/CaseApi.java b/src/main/java/com/sztzjy/resource_center/controller/api/CaseApi.java index 0fc50e1..43c8a8c 100644 --- a/src/main/java/com/sztzjy/resource_center/controller/api/CaseApi.java +++ b/src/main/java/com/sztzjy/resource_center/controller/api/CaseApi.java @@ -98,10 +98,10 @@ public class CaseApi { @ApiOperation("案例题页面查询") @PostMapping("selectCaseList") public PageInfo selectCaseList(@RequestParam Integer index, - @RequestParam Integer size, - @RequestParam(required = false) String keyword, - @RequestParam(required = false) String systemOwner, - @RequestParam(required = false) String schoolId) { + @RequestParam Integer size, + @RequestParam(required = false) String keyword, + @RequestParam(required = false) String systemOwner, + @RequestParam(required = false) String schoolId) { SysOneCatalog sysOneCatalogs = getSysOneCatalogs(systemOwner); String oneId = sysOneCatalogs.getOneId(); List list = caseQuestionMapper.selectCaseByConditions(keyword, oneId, schoolId); @@ -336,4 +336,26 @@ public class CaseApi { String oneId = sysOneCatalogs.getOneId(); return caseQuestionStepMapper.getGradeReportCase(caseIdList, schoolId, oneId); } + + + //根据课程ID查询案例题 + @PostMapping("selectCaseByCourseId") + @ApiOperation("根据课程ID查询案例题") + public List selectCaseByCourseId(@RequestParam String courseId, + @RequestParam String systemOwner, + @RequestParam String schoolId) { + SysOneCatalog sysOneCatalogs = getSysOneCatalogs(systemOwner); + String oneId = sysOneCatalogs.getOneId(); + + SysTopicAndCourseExample example = new SysTopicAndCourseExample(); + example.createCriteria().andTwoIdEqualTo(courseId).andOneIdEqualTo(oneId); + List sysTopicAndCourses = topicAndCourseMapper.selectByExample(example); + + List collect = sysTopicAndCourses.stream().map(SysTopicAndCourse::getTopicId).collect(Collectors.toList()); + + SysCaseQuestionExample example1 = new SysCaseQuestionExample(); + example1.createCriteria().andCaseIdIn(collect).andSourceEqualTo(schoolId); + List list = caseQuestionMapper.selectByExampleWithBLOBs(example1); + return list; + } } diff --git a/src/main/java/com/sztzjy/resource_center/controller/new_module/admin/AdminDataController.java b/src/main/java/com/sztzjy/resource_center/controller/new_module/admin/AdminDataController.java index 798306d..09930b1 100644 --- a/src/main/java/com/sztzjy/resource_center/controller/new_module/admin/AdminDataController.java +++ b/src/main/java/com/sztzjy/resource_center/controller/new_module/admin/AdminDataController.java @@ -10,6 +10,7 @@ import com.sztzjy.resource_center.entity.admin.*; import com.sztzjy.resource_center.mapper.admin.AdminDataLabelMapper; import com.sztzjy.resource_center.mapper.admin.AdminDataMapper; import com.sztzjy.resource_center.mapper.admin.AdminFileMapper; +import com.sztzjy.resource_center.util.PageUtil; import com.sztzjy.resource_center.util.ResultEntity; import com.sztzjy.resource_center.util.file.IFileUtil; import io.swagger.annotations.Api; @@ -162,9 +163,8 @@ public class AdminDataController { @RequestParam(required = false) String keyWord, @ApiParam("精品案例不传,院校案例1") @RequestParam(required = false) String type, @RequestParam(required = false) String labelName) { - PageHelper.startPage(index, size); List adminDataReturnDtos = adminDataMapper.selectByConditions(keyWord, type, labelName); - PageInfo pageInfo = new PageInfo(adminDataReturnDtos); + PageInfo pageInfo = PageUtil.pageHelper(adminDataReturnDtos, index, size); return new ResultEntity<>(pageInfo); } diff --git a/src/main/java/com/sztzjy/resource_center/controller/new_module/stu/StuDataController.java b/src/main/java/com/sztzjy/resource_center/controller/new_module/stu/StuDataController.java index f8c7c34..621c537 100644 --- a/src/main/java/com/sztzjy/resource_center/controller/new_module/stu/StuDataController.java +++ b/src/main/java/com/sztzjy/resource_center/controller/new_module/stu/StuDataController.java @@ -8,6 +8,7 @@ import com.sztzjy.resource_center.entity.admin.*; import com.sztzjy.resource_center.mapper.admin.AdminCollectDataMapper; import com.sztzjy.resource_center.mapper.admin.AdminDataMapper; import com.sztzjy.resource_center.mapper.admin.AdminFileMapper; +import com.sztzjy.resource_center.util.PageUtil; import com.sztzjy.resource_center.util.ResultEntity; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -80,9 +81,8 @@ public class StuDataController { @ApiParam("为空展示所有数据,院校数据传学校ID") @RequestParam(required = false) String source, @ApiParam("收藏案例页面传") @RequestParam(required = false) String userId, @RequestParam(required = false) String labelName) { - PageHelper.startPage(index, size); - List adminDataReturnDtos = adminDataMapper.selectByConditionsBySchoolId(keyWord, source, userId, labelName); - PageInfo pageInfo = new PageInfo(adminDataReturnDtos); + List adminDataReturnDtos = adminDataMapper.selectByConditionsBySchoolId(keyWord, source, userId, labelName); + PageInfo pageInfo = PageUtil.pageHelper(adminDataReturnDtos, index, size); return new ResultEntity>(pageInfo); } }