liuliang
/
hrm-attendance
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

liuliang

Browse Source
zm_dev
liuliang 11 months ago
parent 35e024cf61
commit 81d913eeb5
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File

6
.idea/workspace.xml
Unescape Escape View File

@ -11,7 +11,9 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="baeb3dfb-5097-46c5-933e-6d1dab18b815" name="Changes" comment=""> <list default="true" id="baeb3dfb-5097-46c5-933e-6d1dab18b815" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/dto/ClockPointDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/dto/ClockPointDTO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/AdjustByWorkOverTimeCmd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/AdjustByWorkOverTimeCmd.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/GetClockInPointCmd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/GetClockInPointCmd.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/impl/UtilServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/impl/UtilServiceImpl.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -589,7 +591,7 @@
<workItem from="1715406393526" duration="7053000" /> <workItem from="1715406393526" duration="7053000" />
<workItem from="1715414317145" duration="8285000" /> <workItem from="1715414317145" duration="8285000" />
<workItem from="1715577518625" duration="5016000" /> <workItem from="1715577518625" duration="5016000" />
<workItem from="1715584285304" duration="4325000" /> <workItem from="1715584285304" duration="5261000" />
</task> </task>
<servers /> <servers />
</component> </component>

4
src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/AdjustByWorkOverTimeCmd.java
Unescape Escape View File

@ -27,10 +27,10 @@ public class AdjustByWorkOverTimeCmd extends AbstractCommonCommand<Map<String, O
@Override @Override
public Map<String, Object> execute(CommandContext commandContext) { public Map<String, Object> execute(CommandContext commandContext) {
List<ClockPointDTO> clcokInTimeData = (List<ClockPointDTO>)params.get("clcokInTimeData"); List<ClockPointDTO> clcokInPointList = (List<ClockPointDTO>)params.get("clcokInTimeData");
List<Map<String, Object>> scheduleResult = (List<Map<String, Object>>)params.get("scheduleResult"); List<Map<String, Object>> scheduleResult = (List<Map<String, Object>>)params.get("scheduleResult");
String analysisDate = params.get("analysisDate").toString(); String analysisDate = params.get("analysisDate").toString();
// for ()
return null; return null;
} }

6
src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/GetClockInPointCmd.java
Unescape Escape View File

@ -218,10 +218,10 @@ public class GetClockInPointCmd extends AbstractCommonCommand<Map<String, Object
log.info("经过重新计算卡点时 新的scheduleResult : [{}]",scheduleResult); log.info("经过重新计算卡点时 新的scheduleResult : [{}]",scheduleResult);
List<ClockPointDTO> clcokInTimeData = getClockInPoint(analysisDate, scheduleResult, clockInTimeList,needClockDateList); List<ClockPointDTO> clcokInPointList = getClockInPoint(analysisDate, scheduleResult, clockInTimeList,needClockDateList);
log.info("clcokInTimeData :[{}]",clcokInTimeData); log.info("clcokInPointList :[{}]",clcokInPointList);
resultMap.put("clcokInTimeData", clcokInTimeData); resultMap.put("clcokInPointList", clcokInPointList);
resultMap.put("scheduleResult",scheduleResult); resultMap.put("scheduleResult",scheduleResult);
resultMap.put("needClockDateList",needClockDateList); resultMap.put("needClockDateList",needClockDateList);
return resultMap; return resultMap;

2
src/com/engine/attendance/attendanceanalysis/service/impl/UtilServiceImpl.java
Unescape Escape View File

@ -308,7 +308,7 @@ public class UtilServiceImpl extends Service implements UtilService {
Map<String,Object> resultMap = commandExecutor.execute(new GetClockInPointCmd(params)); Map<String,Object> resultMap = commandExecutor.execute(new GetClockInPointCmd(params));
// params.putAll(resultMap); // params.putAll(resultMap);
// resultMap = commandExecutor.execute(new AdjustByWorkOverTimeCmd(params)); // resultMap = commandExecutor.execute(new AdjustByWorkOverTimeCmd(params));
return (List<ClockPointDTO>)resultMap.get("clcokInTimeData"); return (List<ClockPointDTO>)resultMap.get("clcokInPointList");
} }
/** /**

Write Preview
Loading…
Cancel
Save