From 835f5befcf63d22585f2fd683e4c45ba68c80758 Mon Sep 17 00:00:00 2001
From: liuliang <401809302@qq.com>
Date: Sun, 13 Oct 2024 15:26:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=8B=A4=E7=BB=93=E6=9E=9C=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attendanceanalysis/cmd/GetScheduleResultListCmd.java    | 2 +-
 .../attendanceanalysis/service/impl/ShiftServiceImpl.java   | 1 +
 .../wrapper/UpdateAttendanceResultWrapper.java              | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/GetScheduleResultListCmd.java b/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/GetScheduleResultListCmd.java
index 2770722..5bf10b8 100644
--- a/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/GetScheduleResultListCmd.java
+++ b/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/GetScheduleResultListCmd.java
@@ -115,7 +115,7 @@ public class GetScheduleResultListCmd extends AbstractCommonCommand<Map<String,O
                 adjustWorkOverTimeClass(data, attendanceItems,commandContext);
             }
             resultMap.put(shiftResult.get("bcrq").toString(),bcData);
-            clockInTimeDataMap.put(shiftResult.get("bcrq").toString(),shiftResult.get("clockInTimeData"));
+            clockInTimeDataMap.put(shiftResult.get("bcrq").toString(),shiftResult.get("oldclockInTimeData"));
         }
 
         /** 加班计划*/
diff --git a/src/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/ShiftServiceImpl.java b/src/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/ShiftServiceImpl.java
index 2ae7e62..ca409b4 100644
--- a/src/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/ShiftServiceImpl.java
+++ b/src/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/ShiftServiceImpl.java
@@ -283,6 +283,7 @@ public class ShiftServiceImpl extends Service implements ShiftService {
         clockInTimeDataParam.put("askForLeaveAndEvctionSchedule",askForLeaveAndEvctionSchedule);
         List<ClockPointDTO> clockInTimeData = utilService.getClockInPointCmd(clockInTimeDataParam);
 
+        clockInDataMatchInfo.put("oldclockInTimeData",clockInTimeData);
         if(clockInTimeData != null && clockInTimeData.size() > 0) {
             clockInTimeData = clockInTimeData.stream().filter(ClockPointDTO::isRecord).collect(Collectors.toList());
         }
diff --git a/src/com/engine/jucailinkq/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.java b/src/com/engine/jucailinkq/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.java
index 1731a32..43c2381 100644
--- a/src/com/engine/jucailinkq/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.java
+++ b/src/com/engine/jucailinkq/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.java
@@ -267,6 +267,9 @@ public class UpdateAttendanceResultWrapper extends Service {
                     resultMap.put("itemduration",itemduration);
                     askForLeaveToOffsetAbnomaly.put(askForLeaveList.get(i),(List<Map<String,Object>>)handleMap.get("offsetAskForLeaveAnomaly"));
                     resultMap.put("item",askForLeaveList.get(i).get("jqlx"));
+                    if (sffzcx.equals(CheckBoxEnum.CHECKED.getKey())){
+                        resultList.add(resultMap);
+                    }
                 }else if (!"".equals(qjsc) || (CheckBoxEnum.CHECKED.getKey().equals(btj) && (btgz.equals(HalfDayRuleREnum.HALF_TOTAL_DURATION.getKey()) || btgz.equals(HalfDayRuleREnum.HALF_RATED_DURATION.getKey())))){
                     if (CheckBoxEnum.CHECKED.getKey().equals(btj)){
                         if (btgz.equals(HalfDayRuleREnum.HALF_TOTAL_DURATION.getKey())){
@@ -450,6 +453,9 @@ public class UpdateAttendanceResultWrapper extends Service {
                     resultMap.put("itemduration",itemduration);
                     evectionToOffsetAbnomaly.put(evectionList.get(i),(List<Map<String,Object>>)handleMap.get("offsetEvectionAnomaly"));
                     resultMap.put("item",evectionList.get(i).get("cclx"));
+                    if (sffzcx.equals(CheckBoxEnum.CHECKED.getKey())){
+                        resultList.add(resultMap);
+                    }
                 }else if (!"".equals(ccsc) || (CheckBoxEnum.CHECKED.getKey().equals(btj) && (btgz.equals(HalfDayRuleREnum.HALF_TOTAL_DURATION.getKey()) || btgz.equals(HalfDayRuleREnum.HALF_RATED_DURATION.getKey())))){
                     //时长出差
                     itemduration = Utils.getItemduration(hsl,hsdw,ccscMinute,AccountingUnitEnum.MINUTES,Double.valueOf(scheduleResult.get(0).get("edsc").toString()));