From bb4e77ccadcbf8e4924559babf871983438504ff Mon Sep 17 00:00:00 2001
From: huangzhen <867217663@qq.com>
Date: 星期三, 27 九月 2023 09:53:53 +0800
Subject: [PATCH] 煤矿增加根据身份证查人员信息
---
exam-system/src/main/java/com/gkhy/exam/coalmine/service/EduResourcesManagerService.java | 4 ++--
exam-system/src/main/java/com/gkhy/exam/coalmine/service/impl/EduResourcesManagerServiceImpl.java | 10 ++++++----
exam-system/src/main/java/com/gkhy/exam/coalmine/controller/CmStaffController.java | 2 +-
exam-system/src/main/java/com/gkhy/exam/coalmine/controller/TeacherManageController.java | 4 ++--
exam-system/src/main/java/com/gkhy/exam/coalmine/controller/ExaminerManageController.java | 4 ++--
5 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/exam-system/src/main/java/com/gkhy/exam/coalmine/controller/CmStaffController.java b/exam-system/src/main/java/com/gkhy/exam/coalmine/controller/CmStaffController.java
index cfcaea0..de6f487 100644
--- a/exam-system/src/main/java/com/gkhy/exam/coalmine/controller/CmStaffController.java
+++ b/exam-system/src/main/java/com/gkhy/exam/coalmine/controller/CmStaffController.java
@@ -56,7 +56,7 @@
@ApiOperation(value = "根据身份ID获取人员信息",httpMethod = "GET")
@GetMapping("/getByCode/{code}")
- public AjaxResult selectByCode(@PathVariable @NotNull(message = "id不能为空") String code) {
+ public AjaxResult selectByCode(@PathVariable @NotNull(message = "code不能为空") String code) {
return this.cmStaffManagerService.selectByCode(code);
}
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 d542bc5..ce55cf1 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
@@ -44,9 +44,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);
}
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..a1bc7bf 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
@@ -48,9 +48,9 @@
*/
@ApiOperation(value = "分页获取教师管理",httpMethod = "GET")
@GetMapping("/page")
- public TableDataInfo selectTeacherAll() {
+ public TableDataInfo selectTeacherAll(@RequestParam @NotNull(message = "isCm不能为空") int isCm) {
startPage();
- List<GetTeacherRespDTO> list = eduResourcesManagerService.selectTeacherAll();
+ List<GetTeacherRespDTO> list = eduResourcesManagerService.selectTeacherAll(isCm);
return getDataTable(list);
}
diff --git a/exam-system/src/main/java/com/gkhy/exam/coalmine/service/EduResourcesManagerService.java b/exam-system/src/main/java/com/gkhy/exam/coalmine/service/EduResourcesManagerService.java
index 2837c13..757c2ca 100644
--- a/exam-system/src/main/java/com/gkhy/exam/coalmine/service/EduResourcesManagerService.java
+++ b/exam-system/src/main/java/com/gkhy/exam/coalmine/service/EduResourcesManagerService.java
@@ -22,7 +22,7 @@
AjaxResult getExaminerById(Long id);
- List<GetExaminerRespDTO> selectAll();
+ List<GetExaminerRespDTO> selectAll(Integer isCm);
AjaxResult saveTeacher(TeacherManageAddReqDTO reqDTO);
@@ -32,7 +32,7 @@
AjaxResult getTeacherById(Long id);
- List<GetTeacherRespDTO> selectTeacherAll();
+ List<GetTeacherRespDTO> selectTeacherAll(Integer isCm);
AjaxResult updateStatus(TeacherManageUpdateStatusReqDTO reqDTO);
diff --git a/exam-system/src/main/java/com/gkhy/exam/coalmine/service/impl/EduResourcesManagerServiceImpl.java b/exam-system/src/main/java/com/gkhy/exam/coalmine/service/impl/EduResourcesManagerServiceImpl.java
index 9887bf5..56459e9 100644
--- a/exam-system/src/main/java/com/gkhy/exam/coalmine/service/impl/EduResourcesManagerServiceImpl.java
+++ b/exam-system/src/main/java/com/gkhy/exam/coalmine/service/impl/EduResourcesManagerServiceImpl.java
@@ -215,9 +215,10 @@
@Override
- public List<GetExaminerRespDTO> selectAll() {
+ public List<GetExaminerRespDTO> selectAll(Integer isCm) {
LambdaQueryWrapper<ExaminerManage> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(ExaminerManage::getDelFlag,DeleteStatusEnum.NO.getStatus());
+ wrapper.eq(ExaminerManage::getDelFlag,DeleteStatusEnum.NO.getStatus())
+ .eq(ExaminerManage::getIsCm,isCm);
List<ExaminerManage> list = examinerManageService.list(wrapper);
if (CollectionUtils.isEmpty(list))
return new ArrayList<>();
@@ -340,9 +341,10 @@
}
@Override
- public List<GetTeacherRespDTO> selectTeacherAll() {
+ public List<GetTeacherRespDTO> selectTeacherAll(Integer isCm) {
LambdaQueryWrapper<TeacherManage> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TeacherManage::getDelFlag,DeleteStatusEnum.NO.getStatus());
+ wrapper.eq(TeacherManage::getDelFlag,DeleteStatusEnum.NO.getStatus())
+ .eq(TeacherManage::getIsCm,isCm);
List<TeacherManage> list = teacherManageService.list(wrapper);
if (CollectionUtils.isEmpty(list))
return new ArrayList<>();
--
Gitblit v1.9.2