From c5722674da67258bb527701f45912298c04a9213 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <8153694@qq.com>
Date: Tue, 8 Oct 2024 16:06:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/work/FixWorkOtherAttendance.java | 20 -------------------
1 file changed, 20 deletions(-)
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 84af6693..80c31ebc 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
@@ -30,7 +30,6 @@ import java.util.stream.Collectors;
@Slf4j
public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
-
private AttendanceGroupFixedworkService attendanceGroupFixedworkService;
private AttendanceClassService attendanceClassService;
@@ -51,7 +50,6 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
private AttendanceRecordDetailService attendanceRecordDetailService;
-
private Map<Long, AttendanceClassDetailEntity> classDetailEntityMap;
public FixWorkOtherAttendance(int type) {
@@ -126,7 +124,6 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
DateTime dateTime = DateUtil.parseDate(curDateStr);
DateTime start = DateUtil.parseDate(DateUtil.formatDate(f.getStartTime()));
DateTime end = DateUtil.parseDate(DateUtil.formatDate(f.getEndTime()));
-
boolean in = DateUtil.isIn(dateTime, start, end);
return in;
}).collect(Collectors.toList());
@@ -184,7 +181,6 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
}
}
}
-
//鑾峰彇鐝淇℃伅
AttendanceClassEntity attendanceClassEntity = classEntityMap.get(weekClassId);
if (ObjectUtils.isEmpty(attendanceClassEntity)) {
@@ -193,7 +189,6 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
}
List<AttendanceRecordHikEntity> recordHikEntities = commonData.getRecordHikEntities();
List<AttendanceClassDetailEntity> attendanceClassDetailEntities = attendanceClassEntity.getAttendanceClassDetailList();
-
Integer orderNum = 0;
for (AttendanceClassDetailEntity classDetailEntity : attendanceClassDetailEntities) {
orderNum++;
@@ -205,7 +200,6 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
recordDetailEntity.setOrderNum(orderNum);
commonData.getDetailEntityList().add(recordDetailEntity);
}
-
if (!ObjectUtils.isEmpty(recordHikEntities)) {
//閽堝褰撳ぉ鐨勮€冨嫟璁板綍杩涜璁＄畻涓庡垽鏂�
//鑾峰彇褰撳墠鐝殑澶氫釜鐝锛屼竴涓彮娆′负涓€涓笂涓嬬彮鏃堕棿娈�
@@ -231,7 +225,6 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
//鍒ゆ柇鍦ㄤ笂鐝笌涓嬬彮鍖洪棿璁块棶鍐� 鍦ㄤ笂鐝殑鏈€鍚庢椂闂� 涓庝笅鐝殑寮€濮嬫椂闂�
boolean goOffBetweenTime = DateUtil.isIn(curDateTime, goWorkDateAfter, offWorkDateBefore);
boolean updateCheck = false;
-
if (goInTime) {
//濡傛灉鏄笂鐝墦鍗″尯闂磋寖鍥�,鍒ゆ柇鏄惁杩熷埌
for (AttendanceRecordDetailEntity attendanceRecordDetailEntity : commonData.getDetailEntityList()) {
@@ -293,12 +286,10 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
commonData.getAttendanceRecordEntity().setClassId(attendanceClassDetailEntity == null ? 0L : attendanceClassDetailEntity.getClassId());
commonData.getAttendanceRecordEntity().setClassName(attendanceClassDetailEntity == null ? "" : attendanceClassDetailEntity.getClassName());
}
-
//todo 鍒ゆ柇褰撴棩褰撳墠浜哄憳鏄惁瀛樺湪璇峰亣锛屾湁璇峰亣鍒欓噸鏂拌绠楄€冨嫟 骞舵牴鎹椂闂存 鏇存柊璇︾粏璁板綍涓殑璇峰亣鐘舵€�
if (isLeave) {
//鏌ョ湅璇峰亣鏃堕棿娈碉紝鏄惁涓鸿法澶╄褰�
for (AttendanceLeaveRecordEntity leaveRecord : leaveRecords) {
- // AttendanceLeaveRecordEntity leaveRecord = leaveRecords.get(0);
long between = DateUtil.between(leaveRecord.getStartTime(), leaveRecord.getEndTime(), DateUnit.DAY);
if (between > 0) {
//璺ㄥぉ 鍒ゆ柇褰撳墠鏃ユ湡鏄惁鍦ㄥ叏澶╋紝娌″湪 灏�
@@ -311,7 +302,6 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
//鏈€鍚庝竴澶�
calLeaveDate(commonData, DateUtil.parseDateTime(commonData.getDateStr() + " 00:00:00"), leaveRecord.getEndTime());
}
-
} else if (between == 0) {
calLeaveDate(commonData, leaveRecord.getStartTime(), leaveRecord.getEndTime());
} else {
@@ -335,14 +325,12 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
//褰撴棩 璇峰亣寮€濮嬫椂闂�
//淇敼褰撴棩璁板綍闆�
List<AttendanceRecordDetailEntity> detailEntityList = commonData.getDetailEntityList();
-
for (AttendanceRecordDetailEntity detail : detailEntityList) {
Integer goWorkResult = detail.getGoWorkResult();
Integer offWorkResult = detail.getOffWorkResult();
Date goWorkDate = detail.getGoWorkDate();
Date offWorkDate = detail.getOffWorkDate();
AttendanceClassDetailEntity attendanceClassDetailEntity = classDetailEntityMap.get(detail.getShiftsId());
-
if (GoWorkResultEnum.璇峰亣.getValue() < goWorkResult) {
//鍒ゆ柇 寮傚父璁板綍鏄惁鍦ㄨ鍋囨椂闂存鍐� 濡傛灉缂哄崱鏄病鏈塯oWorkDate鐨�
if (ObjectUtils.isEmpty(goWorkDate)) {
@@ -368,14 +356,11 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
}
if (GoWorkResultEnum.璇峰亣.getValue() < offWorkResult) {
//鍒ゆ柇 寮傚父璁板綍鏄惁鍦ㄨ鍋囨椂闂存鍐�
- // DateUtil.between()
if (ObjectUtils.isEmpty(offWorkDate)) {
Date offWorkDate1 = attendanceClassDetailEntity.getOffWorkDate();
-
if (attendanceClassDetailEntity.getOffWorkDateBefore() > 0) {
offWorkDate1 = DateUtil.offsetMinute(offWorkDate1, -attendanceClassDetailEntity.getOffWorkDateBefore());
}
-
boolean in = DateUtil.isIn(offWorkDate1, DateUtil.parse(DateUtil.format(startLeaveTime, "HH:mm:ss"), "HH:mm:ss"),
DateUtil.parse(DateUtil.format(endLeaveTime, "HH:mm:ss"), "HH:mm:ss"));
if (in) {
@@ -496,8 +481,6 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
AttendanceRecordErrorEntity attendanceRecordErrorEntity = errorService.selectOne(errorQuery, context);
if (ObjectUtils.isEmpty(attendanceRecordErrorEntity)) {
errorService.save(errorEntity, context);
- } else {
- //log.info("寮傚父璁板綍宸插瓨鍦紝涓嶆坊鍔�");
}
}
}
@@ -538,15 +521,12 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
public static void main(String[] args) {
/* String date = "2021-05-01 09:00:00";
String endDate = "2021-05-02 18:00:00";
-
long between = DateUtil.between(DateUtil.parseDate(date), DateUtil.parseDate(endDate), DateUnit.DAY);
-
System.out.println(between);
String curDateStr = "2024-01-05";
DateTime dateTime = DateUtil.parseDate(curDateStr);
DateTime start = DateUtil.parseDate("2024-01-05 18:45:15");
DateTime end = DateUtil.parseDate("2024-01-05 08:45:15");
-
boolean in = DateUtil.isIn(dateTime, start, end);
System.out.println(in);*/
System.out.println(GoWorkResultEnum.getEnumMap().keySet());
--
2.24.3