From b97c9326a5370fd9a190e2a0f49645ff93e9bcef Mon Sep 17 00:00:00 2001
From: huangzhen <867217663@qq.com>
Date: Fri, 27 Oct 2023 15:09:18 +0800
Subject: [PATCH] 教师模块增加根据工种类型进行导入
---
exam-system/src/main/java/com/gkhy/exam/coalmine/controller/TeacherManageController.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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 579cc8a..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;
@@ -48,9 +49,16 @@
*/
@ApiOperation(value = "分页获取教师管理",httpMethod = "GET")
@GetMapping("/page")
- public TableDataInfo selectTeacherAll() {
- startPage();
- List<GetTeacherRespDTO> list = eduResourcesManagerService.selectTeacherAll();
+ public TableDataInfo selectTeacherAll(@RequestParam @NotNull(message = "isCm不能为空") int isCm) {
+ 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