From a3338d5a669f72fe7391e51ef24a50ba813470ca Mon Sep 17 00:00:00 2001
From: yn147 <2270338776@qq.com>
Date: 星期五, 02 十二月 2022 14:11:38 +0800
Subject: [PATCH] 考勤根据subjectid查询
---
src/main/java/com/qxueyou/scc/controller/AttendanceController.java | 6 +++---
src/main/java/com/qxueyou/scc/admin/attendance/AttendanceService.java | 4 ++--
src/main/java/com/qxueyou/scc/admin/attendance/impl/AttendanceServiceImpl.java | 12 ++++++------
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/admin/attendance/AttendanceService.java b/src/main/java/com/qxueyou/scc/admin/attendance/AttendanceService.java
index 3651bb4..68ce734 100644
--- a/src/main/java/com/qxueyou/scc/admin/attendance/AttendanceService.java
+++ b/src/main/java/com/qxueyou/scc/admin/attendance/AttendanceService.java
@@ -14,13 +14,13 @@
/**
* 查询考勤信息
*/
- List<StuStudent> findAttendanceList(Integer limit, Integer pageNum, String keyword);
+ List<StuStudent> findAttendanceList(Integer limit, Integer pageNum, String keyword, String subjectId);
/**
*修改打卡状态
*/
Result updateAttendanceStatus(String studentId, String attendanceStatus);
- int findAttendanceListCount(String keyword);
+ int findAttendanceListCount(String keyword, String subjectId);
}
diff --git a/src/main/java/com/qxueyou/scc/admin/attendance/impl/AttendanceServiceImpl.java b/src/main/java/com/qxueyou/scc/admin/attendance/impl/AttendanceServiceImpl.java
index b783964..91902b8 100644
--- a/src/main/java/com/qxueyou/scc/admin/attendance/impl/AttendanceServiceImpl.java
+++ b/src/main/java/com/qxueyou/scc/admin/attendance/impl/AttendanceServiceImpl.java
@@ -69,10 +69,10 @@
}
@Override
- public List<StuStudent> findAttendanceList(Integer limit, Integer pageNum, String keyword) {
- StringBuffer hql=new StringBuffer("from StuStudent where name like ? and deleteFlag is false");
+ public List<StuStudent> findAttendanceList(Integer limit, Integer pageNum, String keyword, String subjectId) {
+ StringBuffer hql=new StringBuffer("from StuStudent where name like ? and subjectId = ? and deleteFlag is false");
- List<Object> args = CollectionUtils.newList(keyword + "%");
+ List<Object> args = CollectionUtils.newList(keyword + "%",subjectId);
hql.append(" order by createTime desc");
@@ -99,10 +99,10 @@
}
@Override
- public int findAttendanceListCount(String keyword) {
- StringBuffer hql=new StringBuffer("from StuStudent where name like ? and deleteFlag is false");
+ public int findAttendanceListCount(String keyword, String subjectId) {
+ StringBuffer hql=new StringBuffer("from StuStudent where name like ? and subjectId = ? and deleteFlag is false");
- List<Object> args = CollectionUtils.newList(keyword + "%");
+ List<Object> args = CollectionUtils.newList(keyword + "%",subjectId);
return findCount(hql.toString(),args);
}
diff --git a/src/main/java/com/qxueyou/scc/controller/AttendanceController.java b/src/main/java/com/qxueyou/scc/controller/AttendanceController.java
index f6c9128..ef7cb52 100644
--- a/src/main/java/com/qxueyou/scc/controller/AttendanceController.java
+++ b/src/main/java/com/qxueyou/scc/controller/AttendanceController.java
@@ -30,11 +30,11 @@
@ApiOperation(value = "考勤信息", notes = "")
@GetMapping(value = "/attendanceList")
- public Result attendanceList(@RequestParam(defaultValue = "10") Integer limit, @RequestParam(defaultValue = "1") Integer pageNum, String keyword) {
+ public Result attendanceList(@RequestParam(defaultValue = "10") Integer limit, @RequestParam(defaultValue = "1") Integer pageNum, String keyword, String subjectId) {
- List<StuStudent> attendanceList = attendanceService.findAttendanceList(limit, pageNum, keyword);
+ List<StuStudent> attendanceList = attendanceService.findAttendanceList(limit, pageNum, keyword,subjectId);
- int count = attendanceService.findAttendanceListCount(keyword);
+ int count = attendanceService.findAttendanceListCount(keyword,subjectId);
return new Result(true,"success", CollectionUtils.newObjectMap("attendanceList",
--
Gitblit v1.8.0