From 35e024cf611336290dfc261e72059c10d345695d Mon Sep 17 00:00:00 2001 From: liuliang <401809302@qq.com> Date: Mon, 13 May 2024 16:24:31 +0800 Subject: [PATCH 1/2] liuliang --- .idea/workspace.xml | 40 +------------------ .../attendanceanalysis/dto/ClockPointDTO.java | 4 +- 2 files changed, 5 insertions(+), 39 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index a4b5a19..f8f95a8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -10,44 +10,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/com/engine/attendance/attendanceanalysis/dto/ClockPointDTO.java b/src/com/engine/attendance/attendanceanalysis/dto/ClockPointDTO.java index 05f4aa8..fb2b7ff 100644 --- a/src/com/engine/attendance/attendanceanalysis/dto/ClockPointDTO.java +++ b/src/com/engine/attendance/attendanceanalysis/dto/ClockPointDTO.java @@ -18,6 +18,7 @@ import java.util.Map; public class ClockPointDTO { /** * 班次打卡时间 + * 例：2023-11-12 09:00 */ private String classTime; /** @@ -32,11 +33,12 @@ public class ClockPointDTO { private ClockPointEnum timeType; /** * 班次弹性时间 + * 例2023-11-12 09:15 */ private String elasticTime; /** * 卡点所属的班段类型 - * ClassSegmentTypeEnum + * 对应ClassSegmentTypeEnum */ private String classSegmentType; From 81d913eeb591f143468985daee87a145f6f39b4f Mon Sep 17 00:00:00 2001 From: liuliang <401809302@qq.com> Date: Mon, 13 May 2024 16:40:50 +0800 Subject: [PATCH 2/2] liuliang --- .idea/workspace.xml | 6 ++++-- .../cmd/getclockInpoint/AdjustByWorkOverTimeCmd.java | 4 ++-- .../cmd/getclockInpoint/GetClockInPointCmd.java | 6 +++--- .../attendanceanalysis/service/impl/UtilServiceImpl.java | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f8f95a8..2d1cbd5 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -11,7 +11,9 @@ - + + + diff --git a/src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/AdjustByWorkOverTimeCmd.java b/src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/AdjustByWorkOverTimeCmd.java index 8a60f4f..379b73b 100644 --- a/src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/AdjustByWorkOverTimeCmd.java +++ b/src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/AdjustByWorkOverTimeCmd.java @@ -27,10 +27,10 @@ public class AdjustByWorkOverTimeCmd extends AbstractCommonCommand execute(CommandContext commandContext) { - List clcokInTimeData = (List)params.get("clcokInTimeData"); + List clcokInPointList = (List)params.get("clcokInTimeData"); List> scheduleResult = (List>)params.get("scheduleResult"); String analysisDate = params.get("analysisDate").toString(); - +// for () return null; } diff --git a/src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/GetClockInPointCmd.java b/src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/GetClockInPointCmd.java index dd14780..c22cc49 100644 --- a/src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/GetClockInPointCmd.java +++ b/src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/GetClockInPointCmd.java @@ -218,10 +218,10 @@ public class GetClockInPointCmd extends AbstractCommonCommand clcokInTimeData = getClockInPoint(analysisDate, scheduleResult, clockInTimeList,needClockDateList); + List clcokInPointList = getClockInPoint(analysisDate, scheduleResult, clockInTimeList,needClockDateList); - log.info("clcokInTimeData :[{}]",clcokInTimeData); - resultMap.put("clcokInTimeData", clcokInTimeData); + log.info("clcokInPointList :[{}]",clcokInPointList); + resultMap.put("clcokInPointList", clcokInPointList); resultMap.put("scheduleResult",scheduleResult); resultMap.put("needClockDateList",needClockDateList); return resultMap; diff --git a/src/com/engine/attendance/attendanceanalysis/service/impl/UtilServiceImpl.java b/src/com/engine/attendance/attendanceanalysis/service/impl/UtilServiceImpl.java index 58da988..67469ad 100644 --- a/src/com/engine/attendance/attendanceanalysis/service/impl/UtilServiceImpl.java +++ b/src/com/engine/attendance/attendanceanalysis/service/impl/UtilServiceImpl.java @@ -308,7 +308,7 @@ public class UtilServiceImpl extends Service implements UtilService { Map resultMap = commandExecutor.execute(new GetClockInPointCmd(params)); // params.putAll(resultMap); // resultMap = commandExecutor.execute(new AdjustByWorkOverTimeCmd(params)); - return (List)resultMap.get("clcokInTimeData"); + return (List)resultMap.get("clcokInPointList"); } /**