Browse Source

教学点接口-添加是否启用参数

haogh 1 year ago
parent
commit
993b7ff430

+ 2 - 2
src/main/java/com/qmth/exam/reserve/controller/admin/StudentApplyController.java

@@ -58,9 +58,9 @@ public class StudentApplyController extends BaseController {
 
     @ApiOperation(value = "教学点列表")
     @PostMapping(value = "/teaching/list")
-    public List<CategoryVO> listTeaching() {
+    public List<CategoryVO> listTeaching(@ApiParam("查询启用的教学点或查询所有的教学点") @RequestParam(required = false) Boolean flag) {
         LoginUser user = this.curLoginUser();
-        return categoryService.listTeaching(user);
+        return categoryService.listTeaching(user, flag);
     }
 
     @ApiOperation(value = "考点列表")

+ 1 - 1
src/main/java/com/qmth/exam/reserve/service/CategoryService.java

@@ -17,7 +17,7 @@ import com.qmth.exam.reserve.entity.CategoryEntity;
 
 public interface CategoryService extends IService<CategoryEntity> {
 
-    List<CategoryVO> listTeaching(LoginUser user);
+    List<CategoryVO> listTeaching(LoginUser user, Boolean flag);
 
     List<CategoryInfo> getCategoryTreeForStudent(LoginUser loginUser);
 

+ 3 - 1
src/main/java/com/qmth/exam/reserve/service/impl/CategoryServiceImpl.java

@@ -53,7 +53,8 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryDao, CategoryEntity
     private CategoryCacheService categoryCacheService;
 
     @Override
-    public List<CategoryVO> listTeaching(LoginUser user) {
+    public List<CategoryVO> listTeaching(LoginUser user, Boolean flag) {
+        flag = flag != null && flag;
         QueryWrapper<CategoryEntity> wrapper = new QueryWrapper<>();
         LambdaQueryWrapper<CategoryEntity> lw = wrapper.lambda();
         List<CategoryEntity> categoryList = new ArrayList<>();
@@ -61,6 +62,7 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryDao, CategoryEntity
         if (user.getRole().equals(Role.ADMIN)) {
             lw.eq(CategoryEntity::getEnable, Boolean.TRUE);
             lw.eq(CategoryEntity::getLevel, CategoryLevel.TEACHING.getValue());
+            lw.eq(flag, CategoryEntity::getEnable, Boolean.TRUE);
             categoryList = this.getBaseMapper().selectList(wrapper);
         } else if (user.getRole().equals(Role.TEACHING)) { // 教学点管理员
             lw.eq(CategoryEntity::getId, user.getCategoryId());