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

liuliang

Browse Source
zm_dev
liuliang 1 year ago
parent c52d25d110
commit 349b327af6
13 changed files with 84 additions and 143 deletions
Show Stats Download Patch File Download Diff File

BIN
.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat
View File

Binary file not shown.

BIN
.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values
View File

Binary file not shown.

BIN
.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.at
View File

Binary file not shown.

2
.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s
Unescape Escape View File

@ -1 +1 @@
聡饉羳纜駗詝騷鐈踸蟸蘽襹靫觹魘蓒魗詝飦錡郳荴㘎鱑芚鉘蝀蔤轠譠鶷賄酫馳鏨韀鈀鬠襔蘓覺襊荱鍿羃輁颲萪羍裝鮚鉛蚛鶹蟅霶蔥錟郬蚠饌䎬苮鄖鴘鎩髙䓖鴚觵鼂鱷詘褅脃鍃葁輛鸚颴衆黊酼骙<EFBFBD>[遊鯹覽誟鷑豯韙餺踤莖靤鰏聎蘰胣辴羙詐鷎輖鰍髈鎡蟣鼁蟫魐蛅莡誸饁鑤賦詪鴰輳聭虖聫蠋迬飸䦟顝蓯藧驇袕蹘鎺讕駪藧鼛脨翉葠麘䦛釋覑茝蠋軗謵頀鎻鐞蛽缼鐝褢貜蕦鶒藨螑趲蓴韼蠋顛讘脫輲輳蠍趰顜鶑顜魬鎼軕蕩贀菕駩茞銖䦶飶輴蛽脪麖鷳鞁艗蛷鴳鎾釐蠍謷驉鈱鯇訍<EFBFBD><EFBFBD>趶迯褣閻膽鞆鰩霃蹘話鋻邘鏀銘鞈邟鰢蕏閟踴讀鎥鱱鄕詖輜鱵觵顆靫騰鉽膙鴙鹵聎閧蟤躰羖錳阨説纋鷉襨裪踙鵯羕騤黭辴麀鵿賬賬蕔蘽鄛趠<EFBFBD><EFBFBD>饈<EFBFBD><EFBFBD>鼃醻<EFBFBD>醻藑<EFBFBD>觹雫<EFBFBD>饉軀鱺<EFBFBD>醻<EFBFBD>蘿<EFBFBD>脅 閫鎫迆羮<EFBFBD>讅醹閫襺陗鮺鰙詝鶁蓕纞騸虀觸迆<EFBFBD><EFBFBD>}膧莮蕕謢飤閪軁鋦質鱺飗鬺鑘萰趉襥蘫薼萯躭鏸苅鷍鏹頾躮韡髒鈛蘷鑥鍃鉽賧韝駒髖觱騰謝葀謞醲讁鷗黽蓧讙魬邜菙饛陹罀鑽鐜賽鐜鲯賾鴳駧蹚缽討賺䦆膽駪迲鄭鋺膿釓髲饗韾䦶話髴<EFBFBD><EFBFBD>霂驈賽覑詰鍛褣顛膾褢軕菑饛鑿韻䦶軔鶐輷膽鷯螎䦷饟鎻蠌鈶陳鋶聬艗陱迧葥賽鑾蛽釕趽諏膹髲趰迬鄳討蹚銖蹘飷蠎鶐貛銖螎閹覐饜缾虓菓鍘趲輲魩葤購覐閵謝賢騰鎠衯觮鷙苧齳鈑鉺鏾裶<EFBFBD>p譶魀飊鑢莕膓胿顀萿閚詏觩韘苆鴑靂鵜醈芠羃繸躒鞽<EFBFBD>Z鶺鑇觰鹶齲纘鈡鋤謢閧譿駒韠襸葈辷<EFBFBD>y鎥閤苾蒧豔豒繸<EFBFBD>Q蚔踂鬦鱐馷鷆薴骳閂蒣蘜耂鉜錚鯳耉肹蠽鋃譡齓臵齉鎂譚鮕豙臵蘕鳵鶹闡餦鳺襗鑇詠謡詜觶<EFBFBD>聕賦鎨鮶謡鈠鼂<EFBFBD>鍈襼鴟閪藑

BIN
.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat_i
View File

Binary file not shown.

49
.idea/workspace.xml
Unescape Escape View File

@ -10,55 +10,19 @@
</component> </component>
<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 afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/GetAskForLeaveCmd.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/GetClockInTimeListCmd.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/GetEvectionCmd.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/com/engine/attendance/enums/ClassBelongToEnum.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.at" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.at" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat_i" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat_i" afterDir="false" />
<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$/WEB-INF/sqllog/ecologysql" beforeDir="false" afterPath="$PROJECT_DIR$/WEB-INF/sqllog/ecologysql" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/ComputeAttendanceDurationCmd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/ComputeAttendanceDurationCmd.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/log/sdk.log" beforeDir="false" afterPath="$PROJECT_DIR$/log/sdk.log" afterDir="false" />
<change beforePath="$PROJECT_DIR$/out/artifacts/hrm_attendance/hrm-attendance.jar" beforeDir="false" afterPath="$PROJECT_DIR$/out/artifacts/hrm_attendance/hrm-attendance.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/GetClockInPointCmd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/GetClockInPointCmd.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/GetClockInPointCmd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/GetClockInPointCmd.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/job/AttendanceAnalysisJob.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/job/AttendanceAnalysisJob.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/UtilService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/UtilService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/AskForLeaveService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/AskForLeaveService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/EvectionService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/EvectionService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/impl/AskForLeaveServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/impl/AskForLeaveServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/impl/EvectionServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/impl/EvectionServiceImpl.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" /> <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" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/impl/WorkOverTimeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/impl/WorkOverTimeServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/workflow/cmd/GetAskForLeaveRecordListCmd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/workflow/cmd/GetAskForLeaveRecordListCmd.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/workflow/service/impl/BusinessTripsApplyServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/workflow/service/impl/BusinessTripsApplyServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/common/util/CommonUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/common/util/CommonUtil.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/common/util/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/common/util/Utils.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/com/engine/common/util/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/common/util/Utils.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/cmd/GetClockInPointCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/cmd/GetClockInPointCmd.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/job/AttendanceAnalysisJob.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/job/AttendanceAnalysisJob.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/service/AskForLeaveService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/service/AskForLeaveService.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/service/impl/AskForLeaveServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/service/impl/AskForLeaveServiceImpl.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/service/impl/UtilServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/service/impl/UtilServiceImpl.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper$1.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper$2.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/workflow/cmd/GetAskForLeaveRecordListCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/workflow/cmd/GetAskForLeaveRecordListCmd.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/workflow/service/impl/AllowanceServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/workflow/service/impl/AllowanceServiceImpl.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/workflow/service/impl/BusinessTripsApplyServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/workflow/service/impl/BusinessTripsApplyServiceImpl.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/common/util/CommonUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/common/util/CommonUtil.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/common/util/Utils.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/common/util/Utils.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/test-classes/TestGetClockInPoint$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/TestGetClockInPoint$1.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/test-classes/TestGetClockInPoint$2.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/TestGetClockInPoint$2.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/test-classes/TestGetClockInPoint$3.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/TestGetClockInPoint$3.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/test-classes/TestGetClockInPoint$4.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/TestGetClockInPoint$4.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/test-classes/TestGetClockInPoint$5.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/TestGetClockInPoint$5.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/test-classes/TestGetClockInPoint.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/TestGetClockInPoint.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/test-classes/TestObj.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/TestObj.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/test/TestGetClockInPoint.java" beforeDir="false" afterPath="$PROJECT_DIR$/test/TestGetClockInPoint.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/test/TestObj.java" beforeDir="false" afterPath="$PROJECT_DIR$/test/TestObj.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" />
@ -602,7 +566,8 @@
<workItem from="1713316973682" duration="6367000" /> <workItem from="1713316973682" duration="6367000" />
<workItem from="1713331602706" duration="17751000" /> <workItem from="1713331602706" duration="17751000" />
<workItem from="1713403621962" duration="26362000" /> <workItem from="1713403621962" duration="26362000" />
<workItem from="1713490296383" duration="15154000" /> <workItem from="1713490296383" duration="16659000" />
<workItem from="1713764031764" duration="14138000" />
</task> </task>
<servers /> <servers />
</component> </component>

15
src/com/engine/attendance/attendanceanalysis/cmd/ComputeAttendanceDurationCmd.java
Unescape Escape View File

@ -139,11 +139,9 @@ public class ComputeAttendanceDurationCmd extends AbstractCommonCommand<Map<Stri
//按照开始时间，结束时间请假 //按照开始时间，结束时间请假
for (Map<String, Object> scheduleMap:scheduleResult){ for (Map<String, Object> scheduleMap:scheduleResult){
if (ClassSegmentTypeEnum.WORK_TIME.getKey().equals(scheduleMap.get("bdlx"))){ if (ClassSegmentTypeEnum.WORK_TIME.getKey().equals(scheduleMap.get("bdlx"))){
String dtkssj = analysisDate+" "+scheduleMap.get("dtkssj"); String dtkssj = Utils.getkssjTime(scheduleMap,analysisDate);
String dtjssj = analysisDate+" "+scheduleMap.get("dtjssj"); String dtjssj = Utils.getjssjTime(scheduleMap,analysisDate);
if (DateUtil.getTime(dtkssj).compareTo(DateUtil.getTime(dtjssj)) > 0){
dtjssj = DateUtil.AfterDay(analysisDate,1) +" "+scheduleMap.get("dtjssj");
}
employTime +=Utils.getStartAndEndTime(dtkssj,dtjssj,askForLeaveList.get(i)); employTime +=Utils.getStartAndEndTime(dtkssj,dtjssj,askForLeaveList.get(i));
} }
} }
@ -187,12 +185,9 @@ public class ComputeAttendanceDurationCmd extends AbstractCommonCommand<Map<Stri
}else { }else {
//按照开始时间，结束时间请假 //按照开始时间，结束时间请假
for (Map<String, Object> scheduleMap:scheduleResult){ for (Map<String, Object> scheduleMap:scheduleResult){
String dtkssj = analysisDate+" "+scheduleMap.get("dtkssj"); String dtkssj = Utils.getkssjTime(scheduleMap,analysisDate);
String dtjssj = analysisDate+" "+scheduleMap.get("dtjssj"); String dtjssj = Utils.getjssjTime(scheduleMap,analysisDate);
if (ClassSegmentTypeEnum.WORK_TIME.getKey().equals(scheduleMap.get("bdlx"))){ if (ClassSegmentTypeEnum.WORK_TIME.getKey().equals(scheduleMap.get("bdlx"))){
if (DateUtil.getTime(dtkssj).compareTo(DateUtil.getTime(dtjssj)) > 0){
dtjssj = DateUtil.AfterDay(analysisDate,1) +" "+scheduleMap.get("dtjssj");
}
employTime +=Utils.getStartAndEndTime(dtkssj,dtjssj,evectionList.get(i)); employTime +=Utils.getStartAndEndTime(dtkssj,dtjssj,evectionList.get(i));
} }
} }

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

@ -53,18 +53,14 @@ public class GetClockInPointCmd extends AbstractCommonCommand<Map<String, Object
boolean ifEndNeedClock=false; boolean ifEndNeedClock=false;
if (needClockInList.size() > 0 && askForLeaveAndEvctionScheduleList.size() > 0) { if (needClockInList.size() > 0 && askForLeaveAndEvctionScheduleList.size() > 0) {
String startTime = analysisDate + " " + needClockInList.get(0).get("dtkssj").toString(); String startTime = Utils.getkssjTime(needClockInList.get(0),analysisDate);
String endStartTime = analysisDate + " " + needClockInList.get(needClockInList.size()-1).get("dtkssj").toString(); String endStartTime = Utils.getkssjTime(needClockInList.get(needClockInList.size()-1),analysisDate);
String endTime = analysisDate + " " + needClockInList.get(needClockInList.size()-1).get("dtjssj").toString(); String endTime = Utils.getjssjTime(needClockInList.get(needClockInList.size()-1),analysisDate);
if (DateUtil.getTime(endStartTime).compareTo(DateUtil.getTime(endTime)) > 0) {
endTime = DateUtil.AfterDay(analysisDate, 1) + " " + needClockInList.get(needClockInList.size()-1).get("dtjssj");
}
for (Map<String, Object> askForLeaveAndEvctionSchedule :askForLeaveAndEvctionScheduleList){ for (Map<String, Object> askForLeaveAndEvctionSchedule :askForLeaveAndEvctionScheduleList){
String dtkssj = analysisDate + " " + askForLeaveAndEvctionSchedule.get("dtkssj"); String dtkssj = Utils.getkssjTime(askForLeaveAndEvctionSchedule,analysisDate);
String dtjssj = analysisDate + " " + askForLeaveAndEvctionSchedule.get("dtjssj"); String dtjssj = Utils.getjssjTime(askForLeaveAndEvctionSchedule,analysisDate);
if (DateUtil.getTime(dtkssj).compareTo(DateUtil.getTime(dtjssj)) > 0) {
dtjssj = DateUtil.AfterDay(analysisDate, 1) + " " + askForLeaveAndEvctionSchedule.get("dtjssj");
}
if (DateUtil.getTime(dtkssj).compareTo(DateUtil.getTime(startTime))<=0 || DateUtil.getTime(dtkssj).compareTo(DateUtil.getTime(endTime)) >= 0){ if (DateUtil.getTime(dtkssj).compareTo(DateUtil.getTime(startTime))<=0 || DateUtil.getTime(dtkssj).compareTo(DateUtil.getTime(endTime)) >= 0){
askForLeaveAndEvctionSchedule.put("ksdk",CheckBoxEnum.UNCHECKED.getKey()); askForLeaveAndEvctionSchedule.put("ksdk",CheckBoxEnum.UNCHECKED.getKey());
} }
@ -75,11 +71,9 @@ public class GetClockInPointCmd extends AbstractCommonCommand<Map<String, Object
if (DateUtil.getTime(dtkssj).compareTo(DateUtil.getTime(startTime))<=0 && DateUtil.getTime(dtjssj).compareTo(DateUtil.getTime(endTime))<0 && DateUtil.getTime(dtjssj).compareTo(DateUtil.getTime(startTime)) >0){ if (DateUtil.getTime(dtkssj).compareTo(DateUtil.getTime(startTime))<=0 && DateUtil.getTime(dtjssj).compareTo(DateUtil.getTime(endTime))<0 && DateUtil.getTime(dtjssj).compareTo(DateUtil.getTime(startTime)) >0){
//骑在开始上班时间 //骑在开始上班时间
for (Map<String,Object> needClockMap:needClockInList){ for (Map<String,Object> needClockMap:needClockInList){
String kssj = analysisDate + " " + needClockMap.get("dtkssj"); String kssj = Utils.getkssjTime(needClockMap,analysisDate);
String jssj = analysisDate + " " + needClockMap.get("dtjssj"); String jssj = Utils.getjssjTime(needClockMap,analysisDate);
if (DateUtil.getTime(kssj).compareTo(DateUtil.getTime(jssj)) > 0) {
jssj = DateUtil.AfterDay(analysisDate, 1) + " " + needClockMap.get("dtjssj");
}
if (CheckBoxEnum.CHECKED.getKey().equals(needClockMap.get("ksdk")) && DateUtil.getTime(dtjssj).compareTo(DateUtil.getTime(jssj)) >=0){ if (CheckBoxEnum.CHECKED.getKey().equals(needClockMap.get("ksdk")) && DateUtil.getTime(dtjssj).compareTo(DateUtil.getTime(jssj)) >=0){
ifStartNeedClock=true; ifStartNeedClock=true;
@ -90,7 +84,7 @@ public class GetClockInPointCmd extends AbstractCommonCommand<Map<String, Object
if (DateUtil.getTime(dtkssj).compareTo(DateUtil.getTime(startTime)) > 0 && DateUtil.getTime(dtjssj).compareTo(DateUtil.getTime(endTime))>=0 && DateUtil.getTime(dtkssj).compareTo(DateUtil.getTime(endTime)) < 0){ if (DateUtil.getTime(dtkssj).compareTo(DateUtil.getTime(startTime)) > 0 && DateUtil.getTime(dtjssj).compareTo(DateUtil.getTime(endTime))>=0 && DateUtil.getTime(dtkssj).compareTo(DateUtil.getTime(endTime)) < 0){
//骑在下班时间 //骑在下班时间
for (Map<String,Object> needClockMap:needClockInList){ for (Map<String,Object> needClockMap:needClockInList){
String kssj = analysisDate + " " + needClockMap.get("dtkssj"); String kssj = Utils.getkssjTime(needClockMap,analysisDate);
if (CheckBoxEnum.CHECKED.getKey().equals(needClockMap.get("jsdk")) && DateUtil.getTime(dtkssj).compareTo(DateUtil.getTime(kssj)) <=0){ if (CheckBoxEnum.CHECKED.getKey().equals(needClockMap.get("jsdk")) && DateUtil.getTime(dtkssj).compareTo(DateUtil.getTime(kssj)) <=0){
ifEndNeedClock=true; ifEndNeedClock=true;
@ -105,21 +99,17 @@ public class GetClockInPointCmd extends AbstractCommonCommand<Map<String, Object
* 当请假或外出包含打卡卡点时，判断该卡点是否需要打卡 * 当请假或外出包含打卡卡点时，判断该卡点是否需要打卡
*/ */
for (Map<String, Object> askForLeaveAndEvctionMap :askForLeaveAndEvctionScheduleList){ for (Map<String, Object> askForLeaveAndEvctionMap :askForLeaveAndEvctionScheduleList){
String evctiondtkssj = analysisDate + " " +Util.null2String(askForLeaveAndEvctionMap.get("dtkssj")); String evctiondtkssj = Utils.getkssjTime(askForLeaveAndEvctionMap,analysisDate);
String evctionksdk = Util.null2String(askForLeaveAndEvctionMap.get("ksdk")); String evctionksdk = Util.null2String(askForLeaveAndEvctionMap.get("ksdk"));
String evctiondtjssj = analysisDate + " " +Util.null2String(askForLeaveAndEvctionMap.get("dtjssj")); String evctiondtjssj = Utils.getjssjTime(askForLeaveAndEvctionMap,analysisDate);
String evctionjsdk = Util.null2String(askForLeaveAndEvctionMap.get("jsdk")); String evctionjsdk = Util.null2String(askForLeaveAndEvctionMap.get("jsdk"));
if (DateUtil.getTime(evctiondtkssj).compareTo(DateUtil.getTime(evctiondtjssj)) > 0) {
evctiondtjssj = DateUtil.AfterDay(analysisDate, 1) + " " + Util.null2String(askForLeaveAndEvctionMap.get("dtjssj"));
}
List<String> lists = Lists.newArrayList(); List<String> lists = Lists.newArrayList();
for (int i=0;i<scheduleResult.size();i++){ for (int i=0;i<scheduleResult.size();i++){
String dtkssj = analysisDate + " " +Util.null2String(scheduleResult.get(i).get("dtkssj")); String dtkssj = Utils.getkssjTime(scheduleResult.get(i),analysisDate);
String dtjssj = analysisDate + " " +Util.null2String(scheduleResult.get(i).get("dtjssj")); String dtjssj = Utils.getjssjTime(scheduleResult.get(i),analysisDate);
String bdlx = Util.null2String(scheduleResult.get(i).get("bdlx")); String bdlx = Util.null2String(scheduleResult.get(i).get("bdlx"));
if (DateUtil.getTime(dtkssj).compareTo(DateUtil.getTime(dtjssj)) > 0) {
dtjssj = DateUtil.AfterDay(analysisDate, 1) + " " + Util.null2String(scheduleResult.get(i).get("dtjssj"));
}
if (DateUtil.getTime(evctiondtkssj).compareTo(DateUtil.getTime(dtkssj)) <= 0 && DateUtil.getTime(evctiondtjssj).compareTo(DateUtil.getTime(dtkssj)) >=0 if (DateUtil.getTime(evctiondtkssj).compareTo(DateUtil.getTime(dtkssj)) <= 0 && DateUtil.getTime(evctiondtjssj).compareTo(DateUtil.getTime(dtkssj)) >=0
&& !ClassSegmentTypeEnum.REST_AND_DINE.getKey().equals(bdlx) && !ClassSegmentTypeEnum.REST_PERIOD.getKey().equals(bdlx) && !ClassSegmentTypeEnum.DINING_PERIOD.getKey().equals(bdlx)){ && !ClassSegmentTypeEnum.REST_AND_DINE.getKey().equals(bdlx) && !ClassSegmentTypeEnum.REST_PERIOD.getKey().equals(bdlx) && !ClassSegmentTypeEnum.DINING_PERIOD.getKey().equals(bdlx)){
lists.add(scheduleResult.get(i).get("dtkssj")+"-"+ClockPointEnum.START.getKey()+"-"+Util.null2String(scheduleResult.get(i).get("ksdk"))); lists.add(scheduleResult.get(i).get("dtkssj")+"-"+ClockPointEnum.START.getKey()+"-"+Util.null2String(scheduleResult.get(i).get("ksdk")));
@ -178,16 +168,14 @@ public class GetClockInPointCmd extends AbstractCommonCommand<Map<String, Object
scheduleResult.addAll(askForLeaveAndEvctionScheduleList); scheduleResult.addAll(askForLeaveAndEvctionScheduleList);
scheduleResult = scheduleResult.stream().sorted(Comparator.comparing(e->DateUtil.getTime(analysisDate+" "+e.get("dtkssj")).toInstant(ZoneOffset.of("+8")).toEpochMilli())).collect(Collectors.toList()); scheduleResult = scheduleResult.stream().sorted(Comparator.comparing(e->DateUtil.getTime(Utils.getkssjTime(e,analysisDate)).toInstant(ZoneOffset.of("+8")).toEpochMilli())).collect(Collectors.toList());
} }
List<String> needClockDateList = Lists.newArrayList(); List<String> needClockDateList = Lists.newArrayList();
for (int i=0;i<scheduleResult.size();i++){ for (int i=0;i<scheduleResult.size();i++){
String dtkssj = analysisDate + " " + scheduleResult.get(i).get("dtkssj"); String dtkssj = Utils.getkssjTime(scheduleResult.get(i),analysisDate);
String dtjssj = analysisDate + " " + scheduleResult.get(i).get("dtjssj"); String dtjssj = Utils.getjssjTime(scheduleResult.get(i),analysisDate);
if (DateUtil.getTime(dtkssj).compareTo(DateUtil.getTime(dtjssj)) > 0) {
dtjssj = DateUtil.AfterDay(analysisDate, 1) + " " + scheduleResult.get(i).get("dtjssj");
}
if (CheckBoxEnum.CHECKED.getKey().equals(scheduleResult.get(i).get("ksdk"))) { if (CheckBoxEnum.CHECKED.getKey().equals(scheduleResult.get(i).get("ksdk"))) {
needClockDateList.add(dtkssj); needClockDateList.add(dtkssj);
} }
@ -208,18 +196,16 @@ public class GetClockInPointCmd extends AbstractCommonCommand<Map<String, Object
!ClassSegmentTypeEnum.EVECTION.getKey().equals(bdlx) && !ClassSegmentTypeEnum.EVECTION.getKey().equals(bdlx) &&
!ClassSegmentTypeEnum.ASK_FOR_LEAVE.getKey().equals(bdlx)){ !ClassSegmentTypeEnum.ASK_FOR_LEAVE.getKey().equals(bdlx)){
scheduleResult.get(i).put("ksdk",CheckBoxEnum.CHECKED.getKey()); scheduleResult.get(i).put("ksdk",CheckBoxEnum.CHECKED.getKey());
needClockDateList.add(0,analysisDate + " "+dtkssj); needClockDateList.add(0,Utils.getkssjTime(scheduleResult.get(i),analysisDate));
break; break;
} }
if (ifEndNeedClock && needClockInList.get(needClockInList.size()-1).get("dtjssj").equals(dtjssj) && if (ifEndNeedClock && needClockInList.get(needClockInList.size()-1).get("dtjssj").equals(dtjssj) &&
!ClassSegmentTypeEnum.EVECTION.getKey().equals(bdlx) && !ClassSegmentTypeEnum.EVECTION.getKey().equals(bdlx) &&
!ClassSegmentTypeEnum.ASK_FOR_LEAVE.getKey().equals(bdlx)){ !ClassSegmentTypeEnum.ASK_FOR_LEAVE.getKey().equals(bdlx)){
scheduleResult.get(i).put("jsdk",CheckBoxEnum.CHECKED.getKey()); scheduleResult.get(i).put("jsdk",CheckBoxEnum.CHECKED.getKey());
dtkssj = analysisDate + " " + scheduleResult.get(i).get("dtkssj"); dtkssj = Utils.getkssjTime(scheduleResult.get(i),analysisDate);
dtjssj = analysisDate + " " + scheduleResult.get(i).get("dtjssj"); dtjssj = Utils.getjssjTime(scheduleResult.get(i),analysisDate);
if (DateUtil.getTime(dtkssj).compareTo(DateUtil.getTime(dtjssj)) > 0) {
dtjssj = DateUtil.AfterDay(analysisDate, 1) + " " + scheduleResult.get(i).get("dtjssj");
}
needClockDateList.add(dtjssj); needClockDateList.add(dtjssj);
break; break;
} }
@ -258,11 +244,10 @@ public class GetClockInPointCmd extends AbstractCommonCommand<Map<String, Object
/**非请假外出开始打卡逻辑处理*/ /**非请假外出开始打卡逻辑处理*/
if (CheckBoxEnum.CHECKED.getKey().equals(needClockIn.get("ksdk")) && !ClassSegmentTypeEnum.EVECTION.getKey().equals(needClockIn.get("bdlx")) && if (CheckBoxEnum.CHECKED.getKey().equals(needClockIn.get("ksdk")) && !ClassSegmentTypeEnum.EVECTION.getKey().equals(needClockIn.get("bdlx")) &&
!ClassSegmentTypeEnum.ASK_FOR_LEAVE.getKey().equals(needClockIn.get("bdlx"))) { !ClassSegmentTypeEnum.ASK_FOR_LEAVE.getKey().equals(needClockIn.get("bdlx"))) {
String dtkssj = analysisDate + " " + needClockIn.get("dtkssj"); String dtkssj = Utils.getkssjTime(needClockIn,analysisDate);
String dtjssj = analysisDate + " " + needClockIn.get("dtjssj"); String dtjssj = Utils.getjssjTime(needClockIn,analysisDate);
if (DateUtil.getTime(dtkssj).compareTo(DateUtil.getTime(dtjssj)) > 0) {
dtjssj = DateUtil.AfterDay(analysisDate, 1) + " " + needClockIn.get("dtjssj"); //计算最大提前打卡分钟数
}
int tqdkfzs = 60; int tqdkfzs = 60;
if (Util.null2String(needClockIn.get("tqdkfzs")).equals("") && !"".equals(getBeforeClockTime(needClockDateList,dtkssj))){ if (Util.null2String(needClockIn.get("tqdkfzs")).equals("") && !"".equals(getBeforeClockTime(needClockDateList,dtkssj))){
tqdkfzs = DateUtil.getBetWeenMinutes(getBeforeClockTime(needClockDateList,dtkssj),dtkssj); tqdkfzs = DateUtil.getBetWeenMinutes(getBeforeClockTime(needClockDateList,dtkssj),dtkssj);
@ -299,8 +284,9 @@ public class GetClockInPointCmd extends AbstractCommonCommand<Map<String, Object
/**非请假外出结束打卡逻辑处理*/ /**非请假外出结束打卡逻辑处理*/
if (CheckBoxEnum.CHECKED.getKey().equals(needClockIn.get("jsdk")) && !ClassSegmentTypeEnum.EVECTION.getKey().equals(needClockIn.get("bdlx")) && if (CheckBoxEnum.CHECKED.getKey().equals(needClockIn.get("jsdk")) && !ClassSegmentTypeEnum.EVECTION.getKey().equals(needClockIn.get("bdlx")) &&
!ClassSegmentTypeEnum.ASK_FOR_LEAVE.getKey().equals(needClockIn.get("bdlx"))) { !ClassSegmentTypeEnum.ASK_FOR_LEAVE.getKey().equals(needClockIn.get("bdlx"))) {
String dtkssj = analysisDate + " " + needClockIn.get("dtkssj"); String dtkssj = Utils.getkssjTime(needClockIn,analysisDate);
String dtjssj = analysisDate + " " + needClockIn.get("dtjssj"); String dtjssj = Utils.getjssjTime(needClockIn,analysisDate);
//计算最大退后打卡分钟数
int thdkfzs = 60; int thdkfzs = 60;
if (Util.null2String(needClockIn.get("thdkfzs")).equals("") && !"".equals(getNextClockTime(needClockDateList,dtjssj))){ if (Util.null2String(needClockIn.get("thdkfzs")).equals("") && !"".equals(getNextClockTime(needClockDateList,dtjssj))){
thdkfzs = DateUtil.getBetWeenMinutes(dtjssj,getNextClockTime(needClockDateList,dtjssj)); thdkfzs = DateUtil.getBetWeenMinutes(dtjssj,getNextClockTime(needClockDateList,dtjssj));
@ -308,9 +294,6 @@ public class GetClockInPointCmd extends AbstractCommonCommand<Map<String, Object
thdkfzs = Util.null2String(needClockIn.get("thdkfzs")).equals("")?0:Integer.valueOf(needClockIn.get("thdkfzs").toString()); thdkfzs = Util.null2String(needClockIn.get("thdkfzs")).equals("")?0:Integer.valueOf(needClockIn.get("thdkfzs").toString());
} }
if (DateUtil.getTime(dtkssj).compareTo(DateUtil.getTime(dtjssj)) > 0) {
dtjssj = DateUtil.AfterDay(analysisDate, 1) + " " + needClockIn.get("dtjssj");
}
Map<String, Map<String, Object>> jsdkNearestClcokInTime = Utils.getNearestClcokInTimeCmd(dtjssj, clockInTimeList); Map<String, Map<String, Object>> jsdkNearestClcokInTime = Utils.getNearestClcokInTimeCmd(dtjssj, clockInTimeList);
String timeType = ClockPointEnum.EMPTY.getKey(); String timeType = ClockPointEnum.EMPTY.getKey();
@ -340,7 +323,7 @@ public class GetClockInPointCmd extends AbstractCommonCommand<Map<String, Object
*/ */
if (CheckBoxEnum.CHECKED.getKey().equals(needClockIn.get("ksdk")) && (ClassSegmentTypeEnum.EVECTION.getKey().equals(needClockIn.get("bdlx")) || if (CheckBoxEnum.CHECKED.getKey().equals(needClockIn.get("ksdk")) && (ClassSegmentTypeEnum.EVECTION.getKey().equals(needClockIn.get("bdlx")) ||
ClassSegmentTypeEnum.ASK_FOR_LEAVE.getKey().equals(needClockIn.get("bdlx")))){ ClassSegmentTypeEnum.ASK_FOR_LEAVE.getKey().equals(needClockIn.get("bdlx")))){
String dtkssj = analysisDate + " " + needClockIn.get("dtkssj"); String dtkssj = Utils.getkssjTime(needClockIn,analysisDate);
int thdkfzs = Integer.valueOf(Util.null2String(needClockIn.get("thdkfzs"))); int thdkfzs = Integer.valueOf(Util.null2String(needClockIn.get("thdkfzs")));
if (!"".equals(getNextClockTime(needClockDateList,dtkssj))){ if (!"".equals(getNextClockTime(needClockDateList,dtkssj))){
DateUtil.getBetWeenMinutes(dtkssj,getNextClockTime(needClockDateList,dtkssj)); DateUtil.getBetWeenMinutes(dtkssj,getNextClockTime(needClockDateList,dtkssj));
@ -376,11 +359,8 @@ public class GetClockInPointCmd extends AbstractCommonCommand<Map<String, Object
if (CheckBoxEnum.CHECKED.getKey().equals(needClockIn.get("jsdk")) && (ClassSegmentTypeEnum.EVECTION.getKey().equals(needClockIn.get("bdlx")) || if (CheckBoxEnum.CHECKED.getKey().equals(needClockIn.get("jsdk")) && (ClassSegmentTypeEnum.EVECTION.getKey().equals(needClockIn.get("bdlx")) ||
ClassSegmentTypeEnum.ASK_FOR_LEAVE.getKey().equals(needClockIn.get("bdlx")))){ ClassSegmentTypeEnum.ASK_FOR_LEAVE.getKey().equals(needClockIn.get("bdlx")))){
String dtkssj = analysisDate + " " + needClockIn.get("dtkssj"); String dtkssj = Utils.getkssjTime(needClockIn,analysisDate);
String dtjssj = analysisDate + " " + needClockIn.get("dtjssj"); String dtjssj = Utils.getjssjTime(needClockIn,analysisDate);
if (DateUtil.getTime(dtkssj).compareTo(DateUtil.getTime(dtjssj)) > 0) {
dtjssj = DateUtil.AfterDay(analysisDate, 1) + " " + needClockIn.get("dtjssj");
}
int tqdkfzs = Integer.valueOf(Util.null2String(needClockIn.get("tqdkfzs"))); int tqdkfzs = Integer.valueOf(Util.null2String(needClockIn.get("tqdkfzs")));
if (!"".equals(getBeforeClockTime(needClockDateList,dtjssj))){ if (!"".equals(getBeforeClockTime(needClockDateList,dtjssj))){
@ -451,25 +431,20 @@ public class GetClockInPointCmd extends AbstractCommonCommand<Map<String, Object
//弹性核算 //弹性核算
int dxhs = Integer.valueOf(Util.null2String(workScheduleList.get(0).get("dxhs"))); int dxhs = Integer.valueOf(Util.null2String(workScheduleList.get(0).get("dxhs")));
Map<String, Object> ksdkMap = workScheduleList.get(0); Map<String, Object> ksdkMap = workScheduleList.get(0);
String kssjStart = analysisDate + " " + Util.null2String(ksdkMap.get("dtkssj")); String kssjStart = Utils.getkssjTime(ksdkMap,analysisDate);
String jssjStart = analysisDate + " " + Util.null2String(ksdkMap.get("dtjssj")); String jssjStart = Utils.getjssjTime(ksdkMap,analysisDate);
Map<String, Object> jsdkMap = workScheduleList.get(workScheduleList.size() - 1); Map<String, Object> jsdkMap = workScheduleList.get(workScheduleList.size() - 1);
int thdkfzs = Integer.valueOf(Util.null2String(jsdkMap.get("thdkfzs"))); int thdkfzs = Integer.valueOf(Util.null2String(jsdkMap.get("thdkfzs")));
String kssjEnd = analysisDate + " " + Util.null2String(jsdkMap.get("dtkssj")); String kssjEnd = Utils.getkssjTime(jsdkMap,analysisDate);
String jssjEnd = analysisDate + " " + Util.null2String(jsdkMap.get("dtjssj")); String jssjEnd = Utils.getjssjTime(jsdkMap,analysisDate);
if (ksdkMap != jsdkMap) { // if (ksdkMap != jsdkMap) {
if (DateUtil.getTime(kssjStart).compareTo(DateUtil.getTime(jssjStart)) > 0) { // if (DateUtil.getTime(kssjStart).compareTo(DateUtil.getTime(jssjStart)) > 0) {
kssjStart = DateUtil.beforeDay(analysisDate, 1) + " " + Util.null2String(ksdkMap.get("dtkssj")); // kssjStart = DateUtil.beforeDay(analysisDate, 1) + " " + Util.null2String(ksdkMap.get("dtkssj"));
} // }
if (DateUtil.getTime(kssjEnd).compareTo(DateUtil.getTime(jssjEnd)) > 0) { // }
jssjEnd = DateUtil.AfterDay(analysisDate, 1) + " " + Util.null2String(jsdkMap.get("dtjssj"));
}
} else {
jssjEnd = DateUtil.AfterDay(analysisDate, 1) + " " + Util.null2String(jsdkMap.get("dtjssj"));
}
//弹性上班时间 //弹性上班时间
String flexibleWorkTime = ""; String flexibleWorkTime = "";
@ -478,7 +453,7 @@ public class GetClockInPointCmd extends AbstractCommonCommand<Map<String, Object
if (leaveAndEvctionList.size() >0){ if (leaveAndEvctionList.size() >0){
//第一笔请假、外出时间 //第一笔请假、外出时间
Map<String, Object> leaveAndEvctionMap = leaveAndEvctionList.get(0); Map<String, Object> leaveAndEvctionMap = leaveAndEvctionList.get(0);
String leaveAndEvctionkssj = analysisDate + " " + Util.null2String(leaveAndEvctionMap.get("dtkssj")); String leaveAndEvctionkssj = Utils.getkssjTime(leaveAndEvctionMap,analysisDate);
//最大开始弹性时间 //最大开始弹性时间
String minkssjStart = DateUtil.beforeMinutes(kssjStart,zddxfz); String minkssjStart = DateUtil.beforeMinutes(kssjStart,zddxfz);
String maxkssjStart = DateUtil.AfterMinutes(kssjStart,zddxfz); String maxkssjStart = DateUtil.AfterMinutes(kssjStart,zddxfz);

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

@ -35,7 +35,7 @@ public interface UtilService {
*/ */
Map<String,Object> getNeedRecordClockInTime(List<Map<String,Map<String,Object>>> clcokInTimeData); Map<String,Object> getNeedRecordClockInTime(List<Map<String,Map<String,Object>>> clcokInTimeData);
/** /**
* 获得打卡卡点 * 获得打卡卡点以及匹配的打卡时间
*/ */
List<Map<String,Map<String,Object>>> getClockInPointCmd(Map<String,Object> params); List<Map<String,Map<String,Object>>> getClockInPointCmd(Map<String,Object> params);

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

@ -150,9 +150,9 @@ public class UtilServiceImpl extends Service implements UtilService {
map.put("jbzzhlfzs",attendanceItems.get(0).get("jbzzhlfzs")); map.put("jbzzhlfzs",attendanceItems.get(0).get("jbzzhlfzs"));
} }
if (resultList.size() > 1){ if (resultList.size() > 1){
String kssjbegin = e.getKey() +" "+resultList.get(0).get("dtkssj"); String kssjbegin = Utils.getkssjTime(resultList.get(0),e.getKey());
String kssjend = e.getKey() +" "+resultList.get(resultList.size()-1).get("dtkssj"); String kssjend = Utils.getkssjTime(resultList.get(resultList.size()-1),e.getKey());
String kssj = e.getKey() +" "+overtimePlan.get("kssj"); String kssj = Utils.getkssjTime(overtimePlan,e.getKey());
if (DateUtil.getTime(kssj).compareTo(DateUtil.getTime(kssjbegin)) <0){ if (DateUtil.getTime(kssj).compareTo(DateUtil.getTime(kssjbegin)) <0){
//加班计划在开头 //加班计划在开头
if (resultList.get(0).get("dtkssj").equals(overtimePlan.get("jssj")) && if (resultList.get(0).get("dtkssj").equals(overtimePlan.get("jssj")) &&
@ -176,9 +176,9 @@ public class UtilServiceImpl extends Service implements UtilService {
}else { }else {
//加班计划在中间 //加班计划在中间
for (int j=1;j<resultList.size();j++){ for (int j=1;j<resultList.size();j++){
String kssj1 = e.getKey() +" "+resultList.get(j).get("dtkssj"); String kssj1 = Utils.getkssjTime(resultList.get(j),e.getKey());
String kssj2 = e.getKey() +" "+overtimePlan.get("kssj"); String kssj2 = Utils.getkssjTime(overtimePlan,e.getKey());
String kssj3 = e.getKey() +" "+resultList.get(j-1).get("dtkssj"); String kssj3 = Utils.getkssjTime(resultList.get(j-1),e.getKey());
if (DateUtil.getTime(kssj1).compareTo(DateUtil.getTime(kssj2)) >=0 && DateUtil.getTime(kssj3).compareTo(DateUtil.getTime(kssj2)) <=0){ if (DateUtil.getTime(kssj1).compareTo(DateUtil.getTime(kssj2)) >=0 && DateUtil.getTime(kssj3).compareTo(DateUtil.getTime(kssj2)) <=0){
resultList.add(j,map); resultList.add(j,map);
break; break;

8
src/com/engine/attendance/attendanceanalysis/service/impl/WorkOverTimeServiceImpl.java
Unescape Escape View File

@ -89,11 +89,9 @@ public class WorkOverTimeServiceImpl extends Service implements WorkOverTimeServ
//加班结束时间 //加班结束时间
String dtjssj = Util.null2String(scheduleMap.get("dtjssj")); String dtjssj = Util.null2String(scheduleMap.get("dtjssj"));
String kssj = analysisDate +" "+dtkssj; String kssj = Utils.getkssjTime(scheduleMap,analysisDate);
String jssj = analysisDate +" "+dtjssj; String jssj = Utils.getjssjTime(scheduleMap,analysisDate);
if (DateUtil.getTime(kssj).compareTo(DateUtil.getTime(jssj)) >0){
jssj = DateUtil.AfterDay(analysisDate,1)+" "+Util.null2String(scheduleMap.get("dtjssj"));
}
//加班实际开始时间 //加班实际开始时间
String realityStartTime = ""; String realityStartTime = "";
//加班实际结束时间 //加班实际结束时间

11
src/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.java
Unescape Escape View File

@ -210,6 +210,7 @@ public class AttendanceAnalysisWrapper extends Service {
clcokInTimeDataParam.put("scheduleResult",scheduleResult); clcokInTimeDataParam.put("scheduleResult",scheduleResult);
clcokInTimeDataParam.put("clockInTimeList",clockInTimeList); clcokInTimeDataParam.put("clockInTimeList",clockInTimeList);
clcokInTimeDataParam.put("askForLeaveAndEvctionSchedule",askForLeaveAndEvctionSchedule); clcokInTimeDataParam.put("askForLeaveAndEvctionSchedule",askForLeaveAndEvctionSchedule);
//打卡卡点以及匹配的打卡时间
List<Map<String,Map<String,Object>>> clcokInTimeData = utilService.getClockInPointCmd(clcokInTimeDataParam); List<Map<String,Map<String,Object>>> clcokInTimeData = utilService.getClockInPointCmd(clcokInTimeDataParam);
Map<String,Object> recordAbnormalParam = Maps.newHashMap(); Map<String,Object> recordAbnormalParam = Maps.newHashMap();
@ -238,8 +239,6 @@ public class AttendanceAnalysisWrapper extends Service {
List<Map<String,Object>> abnormalClockInList = updateAttendanceResultWrapper.recordAbnormalClockIn(recordAbnormalParam); List<Map<String,Object>> abnormalClockInList = updateAttendanceResultWrapper.recordAbnormalClockIn(recordAbnormalParam);
/** /**
* 出勤津贴 * 出勤津贴
*/ */
@ -313,9 +312,15 @@ public class AttendanceAnalysisWrapper extends Service {
} }
/**
* 合并请假或出差
* @param askForLeaveAndEvctionSchedule
* @param analysisDate
* @return
*/
public List<Map<String,Object>> mergeAskForLeaveAndEvctionSchedule(List<Map<String,Object>> askForLeaveAndEvctionSchedule,String analysisDate){ public List<Map<String,Object>> mergeAskForLeaveAndEvctionSchedule(List<Map<String,Object>> askForLeaveAndEvctionSchedule,String analysisDate){
askForLeaveAndEvctionSchedule = askForLeaveAndEvctionSchedule.stream().sorted(Comparator.comparing(e->DateUtil.getTime(analysisDate+" "+e.get("dtkssj")).toInstant(ZoneOffset.of("+8")).toEpochMilli())).collect(Collectors.toList()); askForLeaveAndEvctionSchedule = askForLeaveAndEvctionSchedule.stream().sorted(Comparator.comparing(e->DateUtil.getTime(Utils.getkssjTime(e,analysisDate)).toInstant(ZoneOffset.of("+8")).toEpochMilli())).collect(Collectors.toList());
for (int i=0;i<askForLeaveAndEvctionSchedule.size()-1;i++){ for (int i=0;i<askForLeaveAndEvctionSchedule.size()-1;i++){
String beforeDtkssj = askForLeaveAndEvctionSchedule.get(i).get("dtkssj").toString(); String beforeDtkssj = askForLeaveAndEvctionSchedule.get(i).get("dtkssj").toString();

13
src/com/engine/common/util/Utils.java
Unescape Escape View File

@ -382,11 +382,9 @@ public class Utils<T> {
int betweenMinutes = DateUtil.getBetWeenMinutes(kssj,jssj); int betweenMinutes = DateUtil.getBetWeenMinutes(kssj,jssj);
log.info("removeRestTime scheduleResult : {}",scheduleResult); log.info("removeRestTime scheduleResult : {}",scheduleResult);
for (Map<String, Object> restSchedule :scheduleResult){ for (Map<String, Object> restSchedule :scheduleResult){
String dtkssj = analysisDate+" "+restSchedule.get("dtkssj"); String dtkssj = Utils.getkssjTime(restSchedule,analysisDate);
String dtjssj = analysisDate+" "+restSchedule.get("dtjssj"); String dtjssj = Utils.getjssjTime(restSchedule,analysisDate);
if (DateUtil.getTime(dtkssj).compareTo(DateUtil.getTime(dtjssj)) > 0){
dtjssj = DateUtil.AfterDay(analysisDate,1) +" "+restSchedule.get("dtjssj");
}
if (DateUtil.getTime(kssj).compareTo(DateUtil.getTime(dtkssj)) <=0 && DateUtil.getTime(jssj).compareTo(DateUtil.getTime(dtjssj)) >=0){ if (DateUtil.getTime(kssj).compareTo(DateUtil.getTime(dtkssj)) <=0 && DateUtil.getTime(jssj).compareTo(DateUtil.getTime(dtjssj)) >=0){
//休息时间在请假时间中间 //休息时间在请假时间中间
betweenMinutes = betweenMinutes - DateUtil.getBetWeenMinutes(dtkssj,dtjssj); betweenMinutes = betweenMinutes - DateUtil.getBetWeenMinutes(dtkssj,dtjssj);
@ -679,12 +677,17 @@ public class Utils<T> {
public static String getjssjTime(Map<String,Object> schedulingMap,String date){ public static String getjssjTime(Map<String,Object> schedulingMap,String date){
String gsrq = Util.null2String(schedulingMap.get("gsrq")); String gsrq = Util.null2String(schedulingMap.get("gsrq"));
String jssj = Util.null2String(schedulingMap.get("dtjssj")); String jssj = Util.null2String(schedulingMap.get("dtjssj"));
String kssj = Util.null2String(schedulingMap.get("dtkssj"));
if (gsrq.equals(ClassBelongToEnum.YESTERDAY.getKey())){ if (gsrq.equals(ClassBelongToEnum.YESTERDAY.getKey())){
date = DateUtil.beforeDay(date,1); date = DateUtil.beforeDay(date,1);
}else if (gsrq.equals(ClassBelongToEnum.NEXTDAY.getKey())){ }else if (gsrq.equals(ClassBelongToEnum.NEXTDAY.getKey())){
date = DateUtil.AfterDay(date,1); date = DateUtil.AfterDay(date,1);
} }
jssj = date+" "+jssj; jssj = date+" "+jssj;
kssj = date+" "+kssj;
if (DateUtil.getTime(kssj).compareTo(DateUtil.getTime(jssj)) > 0) {
jssj = DateUtil.AfterDay(date, 1) + " " + jssj;
}
return jssj; return jssj;
} }

Write Preview
Loading…
Cancel
Save