From 3a762add44449332d6d379e361698850f6066e16 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期一, 19 五月 2025 15:20:12 +0800
Subject: [PATCH] 修改

---
 exam-system/src/main/java/com/gkhy/exam/coalmine/controller/TeacherManageController.java |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 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 a1bc7bf..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
@@ -24,6 +24,7 @@
 import javax.annotation.Resource;
 import javax.validation.constraints.NotNull;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -49,8 +50,15 @@
     @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);
     }
 
@@ -91,7 +99,7 @@
             @ApiImplicitParam(name = "qaAttachment", dataTypeClass = Long.class,value = "资质照id"),
             @ApiImplicitParam(name = "jobTitle", dataTypeClass = String.class,value = "职称"),
             @ApiImplicitParam(name = "eduLevel", dataTypeClass = String.class,value = "最高学历",required = true),
-            @ApiImplicitParam(name = "expiredTime", dataTypeClass = LocalDateTime.class,value = "过期时间",required = true),
+            @ApiImplicitParam(name = "expiredTime", dataTypeClass = LocalDate.class,value = "过期时间",required = true),
             @ApiImplicitParam(name = "isCm", dataTypeClass = Byte.class,value = "是否为煤矿:0为非,1是",required = true),
             @ApiImplicitParam(name = "status", dataTypeClass = String.class,value = "状态不能为空:0-正常,1-停用",required = true),
             @ApiImplicitParam(name = "description", dataTypeClass = String.class,value = "描述"),
@@ -115,7 +123,7 @@
             @ApiImplicitParam(name = "qaAttachment", dataTypeClass = Long.class,value = "资质照id"),
             @ApiImplicitParam(name = "jobTitle", dataTypeClass = String.class,value = "职称"),
             @ApiImplicitParam(name = "eduLevel", dataTypeClass = String.class,value = "最高学历",required = true),
-            @ApiImplicitParam(name = "expiredTime", dataTypeClass = LocalDateTime.class,value = "过期时间",required = true),
+            @ApiImplicitParam(name = "expiredTime", dataTypeClass = LocalDate.class,value = "过期时间",required = true),
             @ApiImplicitParam(name = "isCm", dataTypeClass = Byte.class,value = "是否为煤矿:0为非,1是",required = true),
             @ApiImplicitParam(name = "status", dataTypeClass = String.class,value = "状态不能为空:0-正常,1-停用",required = true),
             @ApiImplicitParam(name = "description", dataTypeClass = String.class,value = "描述"),

--
Gitblit v1.9.2