From ef57094e91072ebe05bb3781e028d6d7ad8a0c45 Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: Mon, 17 Feb 2025 11:15:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-20250116' into dev-20250116
---
exam-system/src/main/java/com/gkhy/exam/coalmine/controller/TeacherManageController.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/exam-system/src/main/java/com/gkhy/exam/coalmine/controller/TeacherManageController.java b/exam-system/src/main/java/com/gkhy/exam/coalmine/controller/TeacherManageController.java
index 25c3734..e85cb88 100644
--- a/exam-system/src/main/java/com/gkhy/exam/coalmine/controller/TeacherManageController.java
+++ b/exam-system/src/main/java/com/gkhy/exam/coalmine/controller/TeacherManageController.java
@@ -50,11 +50,18 @@
@ApiOperation(value = "分页获取教师管理",httpMethod = "GET")
@GetMapping("/page")
public TableDataInfo selectTeacherAll(@RequestParam @NotNull(message = "isCm不能为空") int isCm) {
- startPage();
List<GetTeacherRespDTO> list = eduResourcesManagerService.selectTeacherAll(isCm);
return getDataTable(list);
}
+ @ApiOperation(value = "分页获取教师管理通过工种类型",httpMethod = "GET")
+ @GetMapping("/pageByCondition")
+ public TableDataInfo selectTeacherByCondition(@RequestParam @NotNull(message = "isCm不能为空") int isCm
+ ,@RequestParam Long operateTypeId) {
+ List<GetTeacherRespDTO> list = eduResourcesManagerService.selectTeacherByCondition(isCm,operateTypeId);
+ return getDataTable(list);
+ }
+
/**
* 通过主键查询单条数据
*/
--
Gitblit v1.9.2