修改时间

attendance-performance-manager-ui/admin/src/views/attendance/record/list.vue

@@ -360,6 +360,7 @@ export default {
           prop={options.prop}
           label={options.label}
           width={options.width}
+          formatter={options.formatter}
         ></el-table-column>
       );
     },

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

@@ -410,7 +410,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
                     }
 
                     for (AttendanceRecordDetailEntity detailEntity : detailEntityList) {
-                        if (OffWorkResultEnum.正常.getValue() == detailEntity.getOffWorkResult() ) {
+                        if (OffWorkResultEnum.正常.getValue() == detailEntity.getOffWorkResult()||OffWorkResultEnum.早退.getValue() == detailEntity.getOffWorkResult() ) {
                             attendanceRecordEntity.setSignOutResult(YesNoEnum.YES.getValue());
                             break;
                         }
@@ -428,7 +428,6 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
                         }
                     }
                     attendanceRecordEntity.setAttendType("现场打卡");
-
                     //判断是否存在记录 如果存在 则更新  维度   staffId  attendanceDate shiftsId attendanceGroupId
 
                     AttendanceRecordQuery query = new AttendanceRecordQuery();