Explorar o código

增加考勤时间返回

dzx hai 1 ano
pai
achega
59d68dd7e1

+ 1 - 0
src/main/java/com/xjrsoft/module/attendance/controller/StudentStatisticsController.java

@@ -196,6 +196,7 @@ public class StudentStatisticsController {
                 }else{
                     StudentOutInRecord outInRecord = outInMap.get(record.getUserId());
                     if(outInRecord != null){
+                        record.setRecordTime(outInRecord.getRecordTime());
                         record.setStatus(outInRecord.getAttendanceStatus());
                     }else{
                         record.setStatus("缺勤");

+ 1 - 0
src/main/java/com/xjrsoft/module/attendance/controller/TeacherStatisticsController.java

@@ -109,6 +109,7 @@ public class TeacherStatisticsController {
                 }else{
                     TeacherOutInRecord outInRecord = outInMap.get(record.getUserId());
                     if(outInRecord != null){
+                        record.setRecordTime(outInRecord.getRecordTime());
                         record.setStatus(outInRecord.getAttendanceStatus());
                     }else{
                         record.setStatus("缺勤");

+ 5 - 0
src/main/java/com/xjrsoft/module/attendance/vo/StudentStatisticsPageVo.java

@@ -3,6 +3,8 @@ package com.xjrsoft.module.attendance.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 /**
 * @title: 学生考勤统计列表
 * @Author dzx
@@ -32,4 +34,7 @@ public class StudentStatisticsPageVo {
 
     @ApiModelProperty("学生userId")
     private Long userId;
+
+    @ApiModelProperty("考勤时间")
+    private LocalDateTime recordTime;
 }

+ 5 - 0
src/main/java/com/xjrsoft/module/attendance/vo/TeacherStatisticsPageVo.java

@@ -3,6 +3,8 @@ package com.xjrsoft.module.attendance.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 /**
 * @title: 教师考勤统计列表
 * @Author dzx
@@ -26,4 +28,7 @@ public class TeacherStatisticsPageVo {
 
     @ApiModelProperty("部门名称")
     private String deptName;
+
+    @ApiModelProperty("考勤时间")
+    private LocalDateTime recordTime;
 }