Browse Source

优化打卡范围功能

Your Name 3 years ago
parent
commit
13bc76d221

+ 13 - 4
service-common/src/main/java/com/java110/common/cmd/attendanceClasses/CheckInCmd.java

@@ -186,6 +186,16 @@ public class CheckInCmd extends Cmd {
         List<AttendanceClassesTaskDetailDto> attendanceClassesTaskDetailDtos = attendanceClassesTaskDetailInnerServiceSMOImpl.queryAttendanceClassesTaskDetails(attendanceClassesTaskDetailDto);
         List<AttendanceClassesTaskDetailDto> attendanceClassesTaskDetailDtos = attendanceClassesTaskDetailInnerServiceSMOImpl.queryAttendanceClassesTaskDetails(attendanceClassesTaskDetailDto);
 
 
         if (attendanceClassesTaskDetailDtos == null || attendanceClassesTaskDetailDtos.size() < 1) {
         if (attendanceClassesTaskDetailDtos == null || attendanceClassesTaskDetailDtos.size() < 1) {
+            attendanceClassesTaskDetailDto = new AttendanceClassesTaskDetailDto();
+            attendanceClassesTaskDetailDto.setNowCheckTime(reqJson.getString("checkTime"));
+            attendanceClassesTaskDetailDto.setClassId(attendanceClassesDto.getClassesId());
+            attendanceClassesTaskDetailDto.setStaffId(reqJson.getString("staffId"));
+            attendanceClassesTaskDetailDtos = attendanceClassesTaskDetailInnerServiceSMOImpl.queryAttendanceClassesTaskDetails(attendanceClassesTaskDetailDto);
+
+            if (attendanceClassesTaskDetailDtos != null || attendanceClassesTaskDetailDtos.size() > 0) {
+                context.setResponseEntity(ResultVo.error("重复打卡"));
+                return;
+            }
             context.setResponseEntity(ResultVo.error("未到时间"));
             context.setResponseEntity(ResultVo.error("未到时间"));
             return;
             return;
         }
         }
@@ -206,7 +216,6 @@ public class CheckInCmd extends Cmd {
         }
         }
 
 
 
 
-
         attendanceClassesTaskDetailDto = new AttendanceClassesTaskDetailDto();
         attendanceClassesTaskDetailDto = new AttendanceClassesTaskDetailDto();
         attendanceClassesTaskDetailDto.setTaskId(nowAttendanceClassesTaskDetailDto.getTaskId());
         attendanceClassesTaskDetailDto.setTaskId(nowAttendanceClassesTaskDetailDto.getTaskId());
         attendanceClassesTaskDetailDto.setState(AttendanceClassesTaskDetailDto.STATE_WAIT);
         attendanceClassesTaskDetailDto.setState(AttendanceClassesTaskDetailDto.STATE_WAIT);
@@ -226,15 +235,15 @@ public class CheckInCmd extends Cmd {
         }
         }
 
 
         String msg = "打卡成功";
         String msg = "打卡成功";
-        if(AttendanceClassesTaskDetailDto.STATE_LATE.equals(attendanceClassesTaskDetailPo.getState())){
+        if (AttendanceClassesTaskDetailDto.STATE_LATE.equals(attendanceClassesTaskDetailPo.getState())) {
             msg = "打开迟到";
             msg = "打开迟到";
         }
         }
 
 
-        if(AttendanceClassesTaskDetailDto.STATE_LEAVE.equals(attendanceClassesTaskDetailPo.getState())){
+        if (AttendanceClassesTaskDetailDto.STATE_LEAVE.equals(attendanceClassesTaskDetailPo.getState())) {
             msg = "打开早退";
             msg = "打开早退";
         }
         }
 
 
-        context.setResponseEntity(ResultVo.createResponseEntity(ResultVo.CODE_OK,msg));
+        context.setResponseEntity(ResultVo.createResponseEntity(ResultVo.CODE_OK, msg));
 
 
     }
     }