From d7963a84282c548fee3595b3343e6ae6ca49bb29 Mon Sep 17 00:00:00 2001
From: yn147 <2270338776@qq.com>
Date: 星期五, 24 十一月 2023 14:12:01 +0800
Subject: [PATCH] 学籍，考勤
---
src/main/java/com/qxueyou/scc/controller/AttendanceController.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 48 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/controller/AttendanceController.java b/src/main/java/com/qxueyou/scc/controller/AttendanceController.java
index ce4222d..7e6cb3a 100644
--- a/src/main/java/com/qxueyou/scc/controller/AttendanceController.java
+++ b/src/main/java/com/qxueyou/scc/controller/AttendanceController.java
@@ -1,19 +1,22 @@
package com.qxueyou.scc.controller;
import com.qxueyou.scc.admin.attendance.AttendanceService;
-import com.qxueyou.scc.admin.schoolRoll.ISchoolRollService;
import com.qxueyou.scc.base.model.Result;
-import com.qxueyou.scc.base.util.ClientUtils;
import com.qxueyou.scc.base.util.CollectionUtils;
import com.qxueyou.scc.base.util.QBeanUtils;
import com.qxueyou.scc.teach.student.model.StuStudent;
+import com.qxueyou.scc.teach.subject.model.Subject;
+import com.qxueyou.scc.teach.subject.service.ISubjectService;
+import com.qxueyou.scc.teach.subject.service.impl.SubjectService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
@Api(tags="鑰冨嫟绠＄悊鎺ュ彛")
@RestController
@@ -22,31 +25,64 @@
@Autowired
private AttendanceService attendanceService;
+ @Autowired
+ private ISubjectService iSubjectService;
+
@ApiOperation(value = "鎵撳崱", notes = "")
- @PostMapping(value = "/attendanceUpAndAdd")
- public String attendanceUpAndAdd(String studentId, String subjectId) {
- return attendanceService.attendanceUpAndAdd(studentId,subjectId);
+ @GetMapping(value = "/attendanceUpAndAdd")
+ public String attendanceUpAndAdd(String userId, String subjectId, String subjectName) {
+ return attendanceService.attendanceUpAndAdd(userId,subjectId,subjectName);
}
@ApiOperation(value = "鑰冨嫟淇℃伅", notes = "")
@GetMapping(value = "/attendanceList")
- public Result attendanceList(@RequestParam(defaultValue = "10") Integer limit, @RequestParam(defaultValue = "1") Integer pageNum, String keyword, String subjectId) {
+ public Result attendanceList(@RequestParam(defaultValue = "10") Integer limit, @RequestParam(defaultValue = "1") Integer pageNum, String keyword, String classId) {
- List<StuStudent> attendanceList = attendanceService.findAttendanceList(limit, pageNum, keyword,subjectId);
+ List<StuStudent> attendanceList = attendanceService.findAttendanceList(limit, pageNum, keyword,classId);
- int count = attendanceService.findAttendanceListCount(keyword,subjectId);
+ int count = attendanceService.findAttendanceListCount(keyword,classId);
+
+ List<Object> list = new ArrayList<>();
+ for (StuStudent stuStudent : attendanceList){
+ Map<String,String> mapList = new HashMap<>();
+ mapList.put("name",stuStudent.getName());
+ mapList.put("studentNo",stuStudent.getStudentNo());
+ mapList.put("sex",String.valueOf(stuStudent.getSex()));
+ mapList.put("mobilePhone",stuStudent.getMobilePhone());
+ mapList.put("attendanceStatus",stuStudent.getAttendanceStatus());
+ mapList.put("createTime",String.valueOf(stuStudent.getCreateTime()));
+ mapList.put("studentId",stuStudent.getStudentId());
+ mapList.put("photo",stuStudent.getPhoto());
+ mapList.put("passporName",stuStudent.getPassporName());
+ mapList.put("nationality",stuStudent.getNationality());
+ mapList.put("ancestralHome",stuStudent.getAncestralHome());
+ mapList.put("birthday",stuStudent.getBirthday());
+ mapList.put("birthplace",stuStudent.getBirthplace());
+ mapList.put("chinaStatus",stuStudent.getChinaStatus());
+ mapList.put("registeredAddress",stuStudent.getRegisteredAddress());
+ mapList.put("homeAddress",stuStudent.getHomeAddress());
+ mapList.put("religiousBelief",stuStudent.getReligiousBelief());
+ mapList.put("email",stuStudent.getEmail());
+ mapList.put("workUnit",stuStudent.getWorkUnit());
+ mapList.put("graduationDestination",stuStudent.getGraduationDestination());
+ if(stuStudent.getSubjectId()!=null){
+ String subjectName = iSubjectService.findSubjectName(stuStudent.getSubjectId());
+ mapList.put("subjectName",subjectName);
+ }
+ list.add(mapList);
+ }
return new Result(true,"success", CollectionUtils.newObjectMap("attendanceList",
- QBeanUtils.listBean2ListMap(attendanceList,
+ QBeanUtils.listBean2ListMap(list,
CollectionUtils.newStringMap("name", "studentName", "studentNo", "studentNo","sex","sex","mobilePhone","mobilePhone", "attendanceStatus",
- "attendanceStatus", "createTime", "createTime")),
+ "attendanceStatus", "createTime", "createTime", "studentId", "studentId","photo","photo","passporName","passporName","nationality","nationality","ancestralHome","ancestralHome","birthday","birthday","birthplace","birthplace","chinaStatus","chinaStatus","registeredAddress","registeredAddress","homeAddress","homeAddress","religiousBelief","religiousBelief","email","email","workUnit","workUnit","graduationDestination","graduationDestination","subjectName","subjectName")),
"attendanceCount", count));
}
@ApiOperation(value = "淇敼鑰冨嫟鐘舵��", notes = "")
@GetMapping(value = "/updateAttendanceStatus")
- public Result updateAttendanceStatus(String studentId, String attendanceStatus) {
+ public Result updateAttendanceStatus(String[] studentId, String attendanceStatus) {
return attendanceService.updateAttendanceStatus(studentId,attendanceStatus);
}
}
--
Gitblit v1.8.0