From 3450525681e6e290d80ee5d27d0aaca395b62c8f Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期四, 01 二月 2024 14:42:14 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/swspkmas into zf1

---
 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