From 8d3fac302c217d4dfb74a72f496a8336d9885f6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <8153694@qq.com>
Date: Thu, 15 Aug 2024 15:03:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=80=83=E5=8B=A4=E8=AE=A1?=
=?UTF-8?q?=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/AttendanceRecordHikServiceImpl.java | 10 +++++-----
.../service/impl/AttendanceStatServiceImpl.java | 2 +-
.../xhx/module/attendance/service/work/CommonData.java | 2 +-
.../service/work/FixWorkOtherAttendance.java | 6 +++---
.../src/test/java/com/mortals/httpclient/system.http | 3 +--
5 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordHikServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordHikServiceImpl.java
index df9c9495..6e03a9ea 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordHikServiceImpl.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordHikServiceImpl.java
@@ -147,10 +147,10 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
Map<Long, AttendanceClassDetailEntity> classDetailEntityMap = attendanceClassDetailService.find(new AttendanceClassDetailQuery()).parallelStream().collect(Collectors.toMap(x -> x.getId(), y -> y, (o, n) -> n));
Map<Long, List<AttendanceGroupFixedworkSpecialEntity>> fixedSpecialGroupMap = specialService.find(new AttendanceGroupFixedworkSpecialEntity()).parallelStream().collect(Collectors.groupingBy(x -> x.getFixedWorkId()));
- AttendanceLeaveRecordQuery leaveRecordQuery = new AttendanceLeaveRecordQuery();
+ /* AttendanceLeaveRecordQuery leaveRecordQuery = new AttendanceLeaveRecordQuery();
leaveRecordQuery.setAuditResultList(Arrays.asList(1, 4));
Map<Long, List<AttendanceLeaveRecordEntity>> leaveRecordGroupMap = attendanceLeaveRecordService.find(leaveRecordQuery).parallelStream().collect(Collectors.groupingBy(x -> x.getLeavePersonId()));
-
+*/
for (Map.Entry<Long, List<AttendanceRecordHikEntity>> itemEntry : listMap.entrySet()) {
//鎸変汉鍛�
@@ -180,7 +180,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
StaffEntity staffEntity = staffService.getExtCache(staffId.toString());
if (ObjectUtils.isEmpty(staffEntity)) {
- log.info("staffEntity is null ,staffId:{}", staffId);
+ //log.info("staffEntity is null ,staffId:{}", staffId);
continue;
}
@@ -214,7 +214,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
commonData.setRecordHikEntities(recordHikEntities);
commonData.setFixedSpecialGroupMap(fixedSpecialGroupMap);
commonData.setClassDetailEntityMap(classDetailEntityMap);
- commonData.setLeaveRecordGroupMap(leaveRecordGroupMap);
+ // commonData.setLeaveRecordGroupMap(leaveRecordGroupMap);
workAbstract.doHandleWork(commonData);
}
@@ -244,7 +244,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
commonData.setRecordHikEntities(recordHikEntities);
commonData.setFixedSpecialGroupMap(fixedSpecialGroupMap);
commonData.setClassDetailEntityMap(classDetailEntityMap);
- commonData.setLeaveRecordGroupMap(leaveRecordGroupMap);
+ // commonData.setLeaveRecordGroupMap(leaveRecordGroupMap);
workAbstract.doHandleWork(commonData);
}
}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java
index 02dcdf02..a20ef4c7 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java
@@ -358,7 +358,7 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
attendanceStaffStatService.update(updateStaffStat);
}
}
- log.info("瀹屾垚姹囨€诲綋鍓嶆棩鏈熷亣鏈熶綑棰�.....");
+ //log.info("瀹屾垚姹囨€诲綋鍓嶆棩鏈熷亣鏈熶綑棰�.....");
//姹囨€诲綋鍓嶆棩鏈熷紓甯歌€冨嫟
List<ErrorSummaryVo> errorSummaryVoList = attendanceSummaryDao.getErrorSummary(query);
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/CommonData.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/CommonData.java
index 05b19fca..776b430e 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/CommonData.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/CommonData.java
@@ -40,7 +40,7 @@ public class CommonData {
private Map<Long, List<AttendanceGroupFixedworkSpecialEntity>> fixedSpecialGroupMap;
- private Map<Long, List<AttendanceLeaveRecordEntity>> leaveRecordGroupMap;
+ // private Map<Long, List<AttendanceLeaveRecordEntity>> leaveRecordGroupMap;
}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/FixWorkOtherAttendance.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/FixWorkOtherAttendance.java
index 65ee429d..4c4dee8f 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/FixWorkOtherAttendance.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/FixWorkOtherAttendance.java
@@ -86,7 +86,7 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
Map<Long, List<AttendanceGroupFixedworkSpecialEntity>> fixedSpecialGroupMap = commonData.getFixedSpecialGroupMap();
this.classDetailEntityMap = commonData.getClassDetailEntityMap();
- Map<Long, List<AttendanceLeaveRecordEntity>> leaveRecordGroupMap = commonData.getLeaveRecordGroupMap();
+ // Map<Long, List<AttendanceLeaveRecordEntity>> leaveRecordGroupMap = commonData.getLeaveRecordGroupMap();
if (ObjectUtils.isEmpty(attendanceGroupFixedworkEntity)) {
log.info("attendanceGroupFixedworkEntity is null ! groupId:{}", commonData.getAttendanceGroupEntity().getId());
@@ -122,8 +122,8 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
leaveRecordQuery.setLeavePersonId(commonData.getStaffId());
leaveRecordQuery.setAuditResultList(Arrays.asList(1, 4));
boolean isLeave = false;
- // List<AttendanceLeaveRecordEntity> leaveRecordEntities = attendanceLeaveRecordService.find(leaveRecordQuery);
- List<AttendanceLeaveRecordEntity> leaveRecordEntities = leaveRecordGroupMap.get(commonData.getStaffId());
+ List<AttendanceLeaveRecordEntity> leaveRecordEntities = attendanceLeaveRecordService.find(leaveRecordQuery);
+ //List<AttendanceLeaveRecordEntity> leaveRecordEntities = leaveRecordGroupMap.get(commonData.getStaffId());
List<AttendanceLeaveRecordEntity> leaveRecords = null;
if (!ObjectUtils.isEmpty(leaveRecordEntities)) {
diff --git a/attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http b/attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http
index cee95242..2cbddc58 100644
--- a/attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http
+++ b/attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http
@@ -47,8 +47,7 @@ Content-Type: application/json
{
"attendanceDateStart": "2024-07-01",
- "attendanceDateEnd": "2024-07-19",
- "staffId": 346
+ "attendanceDateEnd": "2024-07-30"
}
--
2.24.3