From cc98f525cbc17d4acdc095b50d382dbaf95c0b68 Mon Sep 17 00:00:00 2001
From: huangzhen <867217663@qq.com>
Date: Thu, 28 Sep 2023 10:50:09 +0800
Subject: [PATCH] bug修复
---
exam-system/src/main/java/com/gkhy/exam/coalmine/controller/ExaminerManageController.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/exam-system/src/main/java/com/gkhy/exam/coalmine/controller/ExaminerManageController.java b/exam-system/src/main/java/com/gkhy/exam/coalmine/controller/ExaminerManageController.java
index 0b320ed..8133535 100644
--- a/exam-system/src/main/java/com/gkhy/exam/coalmine/controller/ExaminerManageController.java
+++ b/exam-system/src/main/java/com/gkhy/exam/coalmine/controller/ExaminerManageController.java
@@ -20,6 +20,7 @@
import javax.annotation.Resource;
import javax.validation.constraints.NotNull;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
@@ -44,9 +45,9 @@
*/
@ApiOperation(value = "分页获取考评员管理",httpMethod = "GET")
@GetMapping("/page")
- public TableDataInfo selectAll() {
+ public TableDataInfo selectAll(@RequestParam @NotNull(message = "isCm不能为空") Integer isCm) {
startPage();
- List<GetExaminerRespDTO> list = eduResourcesManagerService.selectAll();
+ List<GetExaminerRespDTO> list = eduResourcesManagerService.selectAll(isCm);
return getDataTable(list);
}
@@ -87,7 +88,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 = "描述"),
@@ -111,7 +112,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 = "描述"),
@@ -127,7 +128,7 @@
*/
@ApiOperation(value = "根据id删除考评员",httpMethod = "GET")
@ApiImplicitParam(name = "id",dataTypeClass = Long.class,value = "考评员id",required = true)
- @GetMapping("/del")
+ @GetMapping("/del/{id}")
public AjaxResult delete(@PathVariable @NotNull(message = "id不能为空") Long id) {
return this.eduResourcesManagerService.removeExaminerById(id);
}
@@ -137,7 +138,7 @@
*/
@ApiOperation(value = "根据id删除与之关联的工种信息",httpMethod = "GET")
@ApiImplicitParam(name = "id",dataTypeClass = Long.class,value = "关联的工种id",required = true)
- @GetMapping("/operateType/del")
+ @GetMapping("/operateType/del/{id}")
public AjaxResult deleteExaminerBindOperateType(@PathVariable @NotNull(message = "id不能为空") Long id) {
return this.eduResourcesManagerService.deleteExaminerBindOperateType(id);
}
--
Gitblit v1.9.2