学工系统功能房功能模块功能修改
-修改预约记录导出字段(借用学期) -为详情统计添加部门多选查询
This commit is contained in:
@@ -147,7 +147,7 @@ public class SrsStaffOneStopRegistrationRecordController extends BaseController
|
||||
@RequestParam(value = "role", required = false) String role,
|
||||
@RequestParam(value = "borrower", required = false) String borrower,
|
||||
@RequestParam(value = "auditStatus", required = false) Integer auditStatus,
|
||||
@RequestParam(value = "rtDepar", required = false) String rtDepar) {
|
||||
@RequestParam(value = "rtDepar", required = false) List<String> rtDepar) {
|
||||
|
||||
// Call Service method with the Map
|
||||
return success(srsStaffOneStopRegistrationRecordService.getDepartmentReservationCount(startTime,endTime,role,borrower,auditStatus,rtDepar));
|
||||
@@ -162,7 +162,7 @@ public class SrsStaffOneStopRegistrationRecordController extends BaseController
|
||||
@RequestParam(value = "role", required = false) String role,
|
||||
@RequestParam(value = "borrower", required = false) String borrower,
|
||||
@RequestParam(value = "auditStatus", required = false) Integer auditStatus,
|
||||
@RequestParam(value = "rtDepar", required = false) String rtDepar,HttpServletResponse response) {
|
||||
@RequestParam(value = "rtDepar", required = false) List<String> rtDepar,HttpServletResponse response) {
|
||||
List<Map<String, Object>> departmentReservationCount = srsStaffOneStopRegistrationRecordService.getDepartmentReservationCount(startTime, endTime, role, borrower, auditStatus, rtDepar);
|
||||
// 把departmentReservationCount的值转给DepartmentReservationCountExport对象
|
||||
List<DepartmentReservationCountExport> list = new ArrayList<>();
|
||||
@@ -185,7 +185,7 @@ public class SrsStaffOneStopRegistrationRecordController extends BaseController
|
||||
@RequestParam(value = "role", required = false) String role,
|
||||
@RequestParam(value = "borrower", required = false) String borrower,
|
||||
@RequestParam(value = "auditStatus", required = false) Integer auditStatus,
|
||||
@RequestParam(value = "rtDepar", required = false) String rtDepar) {
|
||||
@RequestParam(value = "rtDepar", required = false) List<String> rtDepar) {
|
||||
// Call Service method with the Map
|
||||
return success(srsStaffOneStopRegistrationRecordService.getRoomReservationCount(startTime,endTime,role,borrower,auditStatus,rtDepar));
|
||||
}
|
||||
@@ -199,7 +199,7 @@ public class SrsStaffOneStopRegistrationRecordController extends BaseController
|
||||
@RequestParam(value = "role", required = false) String role,
|
||||
@RequestParam(value = "borrower", required = false) String borrower,
|
||||
@RequestParam(value = "auditStatus", required = false) Integer auditStatus,
|
||||
@RequestParam(value = "rtDepar", required = false) String rtDepar,HttpServletResponse response) {
|
||||
@RequestParam(value = "rtDepar", required = false) List<String> rtDepar,HttpServletResponse response) {
|
||||
// Call Service method with the Map
|
||||
List<Map<String, Object>> roomReservationCount = srsStaffOneStopRegistrationRecordService.getRoomReservationCount(startTime, endTime, role, borrower, auditStatus, rtDepar);
|
||||
List<RoomReservationCountExport> list = new ArrayList<>();
|
||||
@@ -222,7 +222,7 @@ public class SrsStaffOneStopRegistrationRecordController extends BaseController
|
||||
@RequestParam(value = "role", required = false) String role,
|
||||
@RequestParam(value = "borrower", required = false) String borrower,
|
||||
@RequestParam(value = "auditStatus", required = false) Integer auditStatus,
|
||||
@RequestParam(value = "rtDepar", required = false) String rtDepar) {
|
||||
@RequestParam(value = "rtDepar", required = false) List<String> rtDepar) {
|
||||
// Call Service method with the Map
|
||||
return success(srsStaffOneStopRegistrationRecordService.getDepartmentUsageStatistics(startTime,endTime,role,borrower,auditStatus,rtDepar));
|
||||
}
|
||||
@@ -235,7 +235,7 @@ public class SrsStaffOneStopRegistrationRecordController extends BaseController
|
||||
@RequestParam(value = "role", required = false) String role,
|
||||
@RequestParam(value = "borrower", required = false) String borrower,
|
||||
@RequestParam(value = "auditStatus", required = false) Integer auditStatus,
|
||||
@RequestParam(value = "rtDepar", required = false) String rtDepar) {
|
||||
@RequestParam(value = "rtDepar", required = false) List<String> rtDepar) {
|
||||
|
||||
// Call Service method with the Map
|
||||
return success(srsStaffOneStopRegistrationRecordService.getRoomUsageStatistics(startTime,endTime,role,borrower,auditStatus,rtDepar));
|
||||
|
||||
Reference in New Issue
Block a user