修改 请假记录 每人考勤显示

attendance-performance-manager/src/main/java/com/mortals/xhx/common/utils/AddAttendThread.java

@@ -56,7 +56,7 @@ public class AddAttendThread implements Runnable {
             stopWatch.start("执行本地方法");
             for (int i = 0; i <= compare.intValue(); i++) {
                 DateTime curDate = DateUtil.offsetDay(attendStart, i);
-                //log.info("考勤计算日期：{}", curDate.toDateStr());
+                log.info("考勤计算日期：{}", curDate.toDateStr());
                 hikEntity.setAttendanceDateStart(curDate.toDateStr());
                 hikEntity.setAttendanceDateEnd(curDate.toDateStr());
                 hikService.addAttendanceRecordByQuery(hikEntity, context);
@@ -78,4 +78,16 @@ public class AddAttendThread implements Runnable {
         log.info("考勤计算结束！");
     }
 
+
+    public static void main(String[] args) {
+        int compare=0;
+
+        for (int i = 0; i <= compare; i++) {
+
+
+            System.out.println(i);
+        }
+
+    }
+
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceLeaveRecordServiceImpl.java

@@ -110,10 +110,8 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At
                 this.save(leaveRecordEntity);
             } else {
                 leaveRecordEntity.setId(recordEntity.getId());
-
                 leaveRecordEntity.setUpdateUserId(1L);
                 leaveRecordEntity.setUpdateTime(new Date());
-
                 this.update(leaveRecordEntity);
             }
             return leaveRecordEntity;
@@ -139,6 +137,7 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At
         int compare = DateUtil.compare(entity.getStartTime(), new Date());
         if (compare > 0) {
             //请假未来 不做处理
+            log.info("请假未来 不做处理! {}",entity.getLeavePerson());
             return;
         }
         //更新考勤记录与异常记录

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/FixWorkOtherAttendance.java

@@ -334,7 +334,7 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
             commonData.getAttendanceRecordEntity().setClassName(attendanceClassDetailEntity == null ? "" : attendanceClassDetailEntity.getClassName());
         }
 
-        //todo 判断当日当前人员是否存在请假，有请假则重新计算考勤
+        //todo 判断当日当前人员是否存在请假，有请假则重新计算考勤  并根据时间段 更新详细记录中的请假状态
         if (isLeave) {
             //查看请假时间段，是否为跨天记录
             AttendanceLeaveRecordEntity leaveRecord = leaveRecords.get(0);
@@ -390,7 +390,7 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
                 }else{
                     boolean in = DateUtil.isIn(goWorkDate, startLeaveTime, endLeaveTime);
                     if (in) {
-                        detail.setGoWorkResult(GoWorkResultEnum.正常.getValue());
+                        detail.setGoWorkResult(GoWorkResultEnum.请假.getValue());
                     }
                 }
 
@@ -404,7 +404,7 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
                 }else{
                     boolean in = DateUtil.isIn(offWorkDate, startLeaveTime, endLeaveTime);
                     if (in) {
-                        detail.setOffWorkResult(GoWorkResultEnum.正常.getValue());
+                        detail.setOffWorkResult(GoWorkResultEnum.请假.getValue());
                     }
                 }
             }
@@ -437,7 +437,7 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
             AttendanceClassDetailEntity attendanceClassDetailEntity = attendanceClassDetailService.get(recordDetailEntity.getShiftsId());
             if (ObjectUtils.isEmpty(attendanceClassDetailEntity)) continue;
             //判断上班
-            if (GoWorkResultEnum.正常.getValue() != goWorkResult) {
+            if (GoWorkResultEnum.请假.getValue() < goWorkResult) {
                 AttendanceRecordErrorEntity errorEntity = new AttendanceRecordErrorEntity();
                 errorEntity.initAttrValue();
                 BeanUtils.copyProperties(attendanceRecordEntity, errorEntity, new String[]{"id"});
@@ -469,7 +469,7 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
                 errorEntityList.add(errorEntity);
             }
             //判断下班
-            if (OffWorkResultEnum.正常.getValue() != offWorkResult) {
+            if (OffWorkResultEnum.请假.getValue() < offWorkResult) {
                 AttendanceRecordErrorEntity errorEntity = new AttendanceRecordErrorEntity();
                 errorEntity.initAttrValue();
                 BeanUtils.copyProperties(attendanceRecordEntity, errorEntity, new String[]{"id"});
@@ -496,9 +496,7 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
                 if (OffWorkResultEnum.迟到.getValue() == recordDetailEntity.getOffWorkResult()) {
                     errorEntity.setErrorStatus(ErrorStatusEnum.迟到.getValue());
                 }
-
                 errorEntity.setProcessResult(errorEntity.getErrorStatus().toString());
-
                 errorEntityList.add(errorEntity);
             }
         }
@@ -566,7 +564,7 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
 
     public static void main(String[] args) {
 
-        String date = "2021-05-01 09:00:00";
+    /*    String date = "2021-05-01 09:00:00";
         String endDate = "2021-05-02 18:00:00";
 
         long between = DateUtil.between(DateUtil.parseDate(date), DateUtil.parseDate(endDate), DateUnit.DAY);
@@ -582,7 +580,10 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
 
         boolean in = DateUtil.isIn(dateTime, start, end);
 
-        System.out.println(in);
+        System.out.println(in);*/
+
+
+        System.out.println( GoWorkResultEnum.getEnumMap().keySet());
 
 
     }