添加请假等异常考勤计算

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

@@ -153,8 +153,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
                 attendanceRecordEntity.setStaffName(item.getStaffName());
                 attendanceRecordEntity.setDeptId(item.getDeptId());
                 attendanceRecordEntity.setDeptName(item.getDeptName());
-                attendanceRecordEntity.setSalaId(item.getSalaId());
-                attendanceRecordEntity.setSalaName(item.getSalaName());
+
                 attendanceRecordEntity.setPositionId(item.getPositionId());
                 attendanceRecordEntity.setPositionName(item.getPositionName());
                 attendanceRecordEntity.setWorkNum(item.getWorkNum());
@@ -167,6 +166,10 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
                     log.info("staffEntity is null ,staffId:{}", staffId);
                     continue;
                 }
+
+                attendanceRecordEntity.setSalaId(staffEntity.getSalaId());
+                attendanceRecordEntity.setSalaName(staffEntity.getSalaName());
+
                 //通过员工id查询考勤组人员信息
                 List<AttendanceGroupStaffEntity> attendanceGroupStaffEntities = attendanceGroupStaffService.find(new AttendanceGroupStaffQuery().staffId(staffId));
                 //过滤重复考勤组与人员

attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http

@@ -34,6 +34,16 @@ Content-Type: application/json
   "attendanceDateEnd":"2024-01-15"
 }
 
+###海康考勤打卡记录计算1
+POST {{baseUrl}}/attendance/record/hik/addAttendanceRecord
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+  "attendanceDateStart":"2023-12-01",
+  "attendanceDateEnd":"2023-12-01"
+}
+
 
 
 ###海康考勤打卡记录计算