修改导出动态列

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

@@ -160,21 +160,22 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
                 if (!ObjectUtils.isEmpty(detailEntityList)) {
                     attendanceRecordEntity.setAttendanceRecordDetailList(detailEntityList);
                     //判断签到 只要存在一次正常打卡详细记录 就判断签到
+                    attendanceRecordEntity.setSignInResult(YesNoEnum.YES.getValue());
                     for (AttendanceRecordDetailEntity detailEntity : detailEntityList) {
-                        if (GoWorkResultEnum.正常.getValue() == detailEntity.getGoWorkResult() || GoWorkResultEnum.迟到.getValue() == detailEntity.getOffWorkResult()) {
-                            attendanceRecordEntity.setSignInResult(YesNoEnum.YES.getValue());
+                        if (GoWorkResultEnum.缺卡.getValue() == detailEntity.getGoWorkResult() || GoWorkResultEnum.迟到.getValue() == detailEntity.getOffWorkResult()) {
+                            attendanceRecordEntity.setSignInResult(YesNoEnum.NO.getValue());
                             break;
                         }
                     }
-
+                    attendanceRecordEntity.setSignOutResult(YesNoEnum.YES.getValue());
                     for (AttendanceRecordDetailEntity detailEntity : detailEntityList) {
-                        if (OffWorkResultEnum.正常.getValue() == detailEntity.getOffWorkResult() || OffWorkResultEnum.早退.getValue() == detailEntity.getOffWorkResult()) {
-                            attendanceRecordEntity.setSignOutResult(YesNoEnum.YES.getValue());
+                        if (OffWorkResultEnum.缺卡.getValue() == detailEntity.getOffWorkResult() || OffWorkResultEnum.早退.getValue() == detailEntity.getOffWorkResult()) {
+                            attendanceRecordEntity.setSignOutResult(YesNoEnum.NO.getValue());
                             break;
                         }
                     }
 
-                    for (AttendanceRecordDetailEntity detailEntity : detailEntityList) {
+     /*               for (AttendanceRecordDetailEntity detailEntity : detailEntityList) {
                         if (OffWorkResultEnum.缺卡.getValue() == detailEntity.getOffWorkResult()) {
                             attendanceRecordEntity.setPunchResult(YesNoEnum.NO.getValue());
                             break;
@@ -184,10 +185,12 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
                             attendanceRecordEntity.setPunchResult(YesNoEnum.NO.getValue());
                             break;
                         }
-                    }
+                    }*/
 
                     if (YesNoEnum.YES.getValue() == attendanceRecordEntity.getSignInResult() && YesNoEnum.YES.getValue() == attendanceRecordEntity.getSignOutResult()) {
                         attendanceRecordEntity.setPunchResult(YesNoEnum.YES.getValue());
+                    } else {
+                        attendanceRecordEntity.setPunchResult(YesNoEnum.NO.getValue());
                     }
 
                     attendanceRecordEntity.setAttendType("现场打卡");