添加请假跨天判读

attendance-performance-manager/src/main/java/com/mortals/xhx/base/system/user/model/UserEntity.java

@@ -50,7 +50,7 @@ public class UserEntity extends UserVo implements IUser {
      */
     private String qq;
     /**
-     * 用户类型(0.系统用户,1.普通用户,2.工作人员,3.普通员工)
+     * 用户类型(0.系统用户,1.普通用户,2.工作人员,3.巡查人员,4.窗口负责人)
      */
     private Integer userType;
 

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

@@ -729,7 +729,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
             //分组查看当前人
             Long groupId = item.getKey();
             AttendanceGroupFixedworkEntity attendanceGroupFixedworkEntity = groupFixedworkService.selectOne(new AttendanceGroupFixedworkQuery().groupId(groupId));
-            String week = this.getWeek(new Date());
+            String week = this.getWeek(DateUtil.parseDate(recordHikQuery.getAttendanceDateStart()));
             Long weekClassId = this.getWeekClassId(attendanceGroupFixedworkEntity, week);
             //weekClassId为-1 则不在考勤
             //对于节假日 分两种情况。

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

@@ -49,7 +49,7 @@ Content-Type: application/json
 
 {
   "attendanceDateStart":"2023-12-04",
-  "attendanceDateEnd":"2023-12-04",
+  "attendanceDateEnd":"2023-12-08",
   "staffId": 322
 }
 
@@ -61,8 +61,8 @@ Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-  "attendanceDateStart":"2023-12-20",
-  "attendanceDateEnd":"2023-12-20"
+  "attendanceDateStart":"2024-01-17",
+  "attendanceDateEnd":"2024-01-24"
 }