update

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseScheduleEndDto.java

@@ -1,7 +1,8 @@
 package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.biz.dal.entity.CourseSchedule;
-import com.ym.mec.biz.dal.enums.SignAttendanceStatusEnum;
+import com.ym.mec.biz.dal.enums.SignInStatusEnum;
+import com.ym.mec.biz.dal.enums.SignOutStatusEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 
 import java.util.Date;
@@ -26,9 +27,9 @@ public class CourseScheduleEndDto extends CourseSchedule {
 
     private int isSignOut = 3;
 
-    private SignAttendanceStatusEnum signInStatusEnum;
+    private SignInStatusEnum signInStatusEnum;
 
-    private SignAttendanceStatusEnum signOutStatusEnum;
+    private SignOutStatusEnum signOutStatusEnum;
 
     private YesOrNoEnum isCallNames;
 
@@ -38,19 +39,19 @@ public class CourseScheduleEndDto extends CourseSchedule {
 
     private String studentId;
 
-    public SignAttendanceStatusEnum getSignInStatusEnum() {
+    public SignInStatusEnum getSignInStatusEnum() {
         return signInStatusEnum;
     }
 
-    public void setSignInStatusEnum(SignAttendanceStatusEnum signInStatusEnum) {
+    public void setSignInStatusEnum(SignInStatusEnum signInStatusEnum) {
         this.signInStatusEnum = signInStatusEnum;
     }
 
-    public SignAttendanceStatusEnum getSignOutStatusEnum() {
+    public SignOutStatusEnum getSignOutStatusEnum() {
         return signOutStatusEnum;
     }
 
-    public void setSignOutStatusEnum(SignAttendanceStatusEnum signOutStatusEnum) {
+    public void setSignOutStatusEnum(SignOutStatusEnum signOutStatusEnum) {
         this.signOutStatusEnum = signOutStatusEnum;
     }
 

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/SignAttendanceStatusEnum.java → mec-biz/src/main/java/com/ym/mec/biz/dal/enums/SignInStatusEnum.java

@@ -2,15 +2,15 @@ package com.ym.mec.biz.dal.enums;
 
 import com.ym.mec.common.enums.BaseEnum;
 
-public enum SignAttendanceStatusEnum implements BaseEnum<Integer, SignAttendanceStatusEnum> {
-    NORMAL(1,"正常"),
-    UNUSUAL(0,"异常"),
+public enum SignInStatusEnum implements BaseEnum<Integer, SignInStatusEnum> {
+    NORMAL(1,"正常签到"),
+    UNUSUAL(0,"异常签到"),
     NO(3,"未签到");
 
     private Integer code;
     private String msg;
 
-    SignAttendanceStatusEnum(Integer code, String msg) {
+    SignInStatusEnum(Integer code, String msg) {
         this.code = code;
         this.msg = msg;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/SignOutStatusEnum.java

@@ -0,0 +1,34 @@
+package com.ym.mec.biz.dal.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+public enum SignOutStatusEnum implements BaseEnum<Integer, SignOutStatusEnum> {
+    NORMAL(1,"正常签退"),
+    UNUSUAL(0,"异常签退"),
+    NO(3,"未签退");
+
+    private Integer code;
+    private String msg;
+
+    SignOutStatusEnum(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    @Override
+    public Integer getCode() {
+        return this.code;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -47,6 +47,8 @@ import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static com.ym.mec.biz.dal.enums.SignInStatusEnum.*;
+
 @Service
 public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSchedule> implements CourseScheduleService {
 
@@ -3650,8 +3652,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                     TeacherAttendance teacherAttendance=courseTeacherAttendances.get(0);
                     result.setIsSignIn(Objects.isNull(teacherAttendance.getSignInStatus())?3:teacherAttendance.getSignInStatus().getCode());
                     result.setIsSignOut(Objects.isNull(teacherAttendance.getSignOutStatus())?3:teacherAttendance.getSignOutStatus().getCode());
-					result.setSignInStatusEnum(result.getIsSignIn() == 1?SignAttendanceStatusEnum.NORMAL:result.getIsSignIn() == 0?SignAttendanceStatusEnum.UNUSUAL:SignAttendanceStatusEnum.NO);
-					result.setSignOutStatusEnum(result.getIsSignOut() == 1?SignAttendanceStatusEnum.NORMAL:result.getIsSignOut() == 0?SignAttendanceStatusEnum.UNUSUAL:SignAttendanceStatusEnum.NO);
+					result.setSignInStatusEnum(result.getIsSignIn() == 1?NORMAL:result.getIsSignIn() == 0?UNUSUAL:NO);
+					result.setSignOutStatusEnum(result.getIsSignOut() == 1?SignOutStatusEnum.NORMAL:result.getIsSignOut() == 0? SignOutStatusEnum.UNUSUAL: SignOutStatusEnum.NO);
                     result.setSignInTime(teacherAttendance.getSignInTime());
                     result.setSignOutTime(teacherAttendance.getSignOutTime());
                     result.setRemark(teacherAttendance.getRemark());