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

作用时段转班段类型

Browse Source
zm_dev
liuliang 9 months ago
parent c75c04de37
commit a7ec5fd591
5 changed files with 29 additions and 52 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.

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

@ -1 +1 @@
аyГ~цЭ|дй~Й~хд|И}ф─Л~ш}Т~М|юй~с}С}ю─Я}У}Ь~к~Х}Н~г}ЭЖ|б}О}Ъ┌рqчhаjЖkЛjВhТjгiлjфkзiУhЭlЩkуoжpжxЯuЭtЧvВvтwЛvа{иxяyТxЙvЮxЦvБyиxрzпwЧvзxа▌Ы▒Ч▓ш░С⌠ж░М░Ч▒С▌ъ▐м▌Ж▐С▒Ъ▐з░н▌Н▐Ш░з▐Э▄д▄Д▒о░Щ▒Ъ▀Д⌠в░к▐д█Щ▌Р▐ы▒щ░ч▒А░я▐П▌Ь░э░я▒Ю▓ч▌ц▒П▒Г▓З▌У█Ъ░л▌о▐щ▐б▐Э█х■д░Ъ█т▐з▌Ж▓Т▌Н▐Б▒У▐щ█П▒с░Щ▌л░э⌠р▐р▌Ц▓ь░к▓м▐И█п█Й▌П▌Р▒ж░п▐А▐л█и▒Ш▓Ф█м▄ю░м▌Ш▌д▐ш░ж▌и▌И▐Ж▐ъ▐В▌н▒л▐О▐Й█Н└иwбsСsЪvцsЕwаtПsщyАlГtДoфsшqлlЬqЦpЗrКlыsЖsвuрsХmхoьqЛrщlйjНZК\т^Й\ФZоVфZХXШ\РVИhбwчxкzБyп{Шzб|ш{оxОxЙ|фzд|яwи{ЗvБyК|ЦVеZюUаYфSТYхXе\цXэaцcвeщ_ЮWхWц^бTмRюTЫTПZсWж[ъTЕ]ы[ЪWТRДWгVоZГZЧUЮYСQсXЮWБYЦ[кZшgО~В~ыzю~л{РzвyК{Бxи~ц|М{ъ~тж|Ф}к~н}ы│чaчdВ]вhп]вaь^ГaК`гaй^ж_Ш]С]И]в^Т^в^и]Т]Х`ЯkКgшgюgЩgюhШcТ]жWЬkшiцqжh
аyГ~цЭ|дй~Й~хд|И}ф─Л~ш}Т~М|юй~с}С}ю─Я}У}Ь~к~Х}Н~г}ЭЖ|б}О}Ъ┌рqчhаjЖkЛjВhТjгiлjфkзiУhЭlЩkуoжpжxЯuЭtЧvВvтwЛvа{иxяyТxЙvЮxЦvБyиxрzпwЧvзxа▌Ы▒Ч▓ш░С⌠ж░М░Ч▒С▌ъ▐м▌Ж▐С▒Ъ▐з░н▌Н▐Ш░з▐Э▄д▄Д▒о░Щ▒Ъ▀Д⌠в░к▐д█Щ▌Р▐ы▒щ░ч▒А░я▐П▌Ь░э░я▒Ю▓ч▌ц▒П▒Г▓З▌У█Ъ░л▌о▐щ▐б▐Э█х■д░Ъ█т▐з▌Ж▓Т▌Н▐Б▒У▐щ█П▒с░Щ▌л░э⌠р▐р▌Ц▓ь░к▓м▐И█п█Й▌П▌Р▒ж░п▐А▐л█и▒Ш▓Ф█м▄ю░м▌Ш▌д▐ш░ж▌и▌И▐Ж▐ъ▐В▌н▒л▐О▐Й█Н└иwбsСsЪvцsЕwаtПsщyАlГtДoфsшqлlЬqЦpЗrКlыsЖsвuрsХmхoьqЛrщlйjНZК\т^Й\ФZоVфZХXШ\РVИhбwчxкzБyп{Шzб|ш{оxОxЙ|фzд|яwи{ЗvБyК|ЦVеZюUаYфSТYхXе\цXэaцcвeщ_ЮWхWц^бTмRюTЫTПZсWж[ъTЕ]ы[ЪWТRДWгVоZГZЧUЮYСQсXЮWБYЦ[кZшgО~В~ыzю~л{РzвyК{Бxи~ц|М{ъ~тж|Ф}к~н}ы│чaчdВ]вhп]вaь^ГaК`гaй^ж_Ш]С]И]в^Т^в^и]Т]Х`ЯkКgшgюgЩgюhШcТ]жWЬkшiцqжhЧoяLбLшLюMБMГMКMКMНMсNХMКMНMГMХMЙMНMФMХMЯKДKЕKЙKюKаJцJЪJЕKЦKБKоLшKФKГKГKЕKИKЕKЕKИJюJФJсKЕKИKФKЕKФKДKГKГKпLДKЕKшKжJаJХJДKЕKХKЦKоLЦKДKЦKИKГKФKЕKюKдJЧIсKБKЦKХKГKЕKДKГKЕKГKрLФKГKКJЪIсJтKЕKФKГKДKоLФKФKФKДKЙKДKвKшJюJФJЧKДKДKДKДK

27
.idea/workspace.xml
Unescape Escape View File

@ -16,31 +16,7 @@
<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$/WEB-INF/sqllog/ecologysql" beforeDir="false" afterPath="$PROJECT_DIR$/WEB-INF/sqllog/ecologysql" 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/jucailinkq/attendance/attendanceanalysis/cmd/GetScheduleResultListCmd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/GetScheduleResultListCmd.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/workovertime/SaveWorkOverTimeCmd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/workovertime/SaveWorkOverTimeCmd.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/ForgetClockInServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/ForgetClockInServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/attendanceanalysis/web/AttendanceanalysisAction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/attendanceanalysis/web/AttendanceanalysisAction.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/vacation/job/holidaygeneration/tactics/ByIntervalPayMentWay.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/vacation/job/holidaygeneration/tactics/ByIntervalPayMentWay.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/vacation/job/holidaygeneration/tactics/BySchedulePaymentWay.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/vacation/job/holidaygeneration/tactics/BySchedulePaymentWay.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/vacation/job/holidaygeneration/tactics/OneTimePayMentWay.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/vacation/job/holidaygeneration/tactics/OneTimePayMentWay.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/vacation/job/holidaygeneration/tactics/SinglePaymentInFullWay.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/vacation/job/holidaygeneration/tactics/SinglePaymentInFullWay.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/vacation/util/VocationCommonUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/vacation/util/VocationCommonUtil.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailinkq/common/util/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/jucailinkq/common/util/Utils.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/workovertime/SaveWorkOverTimeCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/workovertime/SaveWorkOverTimeCmd.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/ForgetClockInServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/ForgetClockInServiceImpl.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/web/AttendanceanalysisAction.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/web/AttendanceanalysisAction.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/component/persongroup/service/impl/SchedulingResultsServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/component/persongroup/service/impl/SchedulingResultsServiceImpl.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/vacation/job/holidaygeneration/tactics/ByIntervalPayMentWay.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/vacation/job/holidaygeneration/tactics/ByIntervalPayMentWay.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/vacation/job/holidaygeneration/tactics/BySchedulePaymentWay.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/vacation/job/holidaygeneration/tactics/BySchedulePaymentWay.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/vacation/job/holidaygeneration/tactics/OneTimePayMentWay.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/vacation/job/holidaygeneration/tactics/OneTimePayMentWay.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/vacation/job/holidaygeneration/tactics/SinglePaymentInFullWay.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/vacation/job/holidaygeneration/tactics/SinglePaymentInFullWay.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/vacation/util/VocationCommonUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/vacation/util/VocationCommonUtil.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/common/util/Utils.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/common/util/Utils.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/test-classes/vocation/Test1.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/vocation/Test1.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/test/vocation/Test1.java" beforeDir="false" afterPath="$PROJECT_DIR$/test/vocation/Test1.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -744,7 +720,8 @@
<workItem from="1720590109223" duration="14820000" />
<workItem from="1720662652644" duration="4776000" />
<workItem from="1720675844486" duration="17476000" />
<workItem from="1720747895355" duration="7141000" />
<workItem from="1720747895355" duration="7406000" />
<workItem from="1720756125339" duration="1646000" />
</task>
<servers />
</component>

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

@ -595,35 +595,10 @@ public class Utils<T> {
/**
* 根据班段类型获得作用时段
* @param workFor
* @return
*/
public static String getWorkFor(String workFor){
String bdlx="";
if (WorkForTimeEnum.WORK_TIME.getKey().equals(workFor)){
bdlx = ClassSegmentTypeEnum.WORK_TIME.getKey();
}else if (WorkForTimeEnum.DELAY_TO_WORK_OVERTIME.getKey().equals(workFor)){
bdlx = ClassSegmentTypeEnum.EXTENDED_OVERTIME.getKey();
}else if (WorkForTimeEnum.EARLY_TO_WORK_OVERTIME.getKey().equals(workFor)){
bdlx = ClassSegmentTypeEnum.EARLY_OVERTIME.getKey();
}else if (WorkForTimeEnum.PLAN_WORK_OVERTIME.getKey().equals(workFor)){
bdlx = ClassSegmentTypeEnum.OVERTIME_PLAN.getKey();
}else if (WorkForTimeEnum.LEAVE_TIME.getKey().equals(workFor)){
bdlx = ClassSegmentTypeEnum.ASK_FOR_LEAVE.getKey();
}else if (WorkForTimeEnum.EVECTION.getKey().equals(workFor)){
bdlx = ClassSegmentTypeEnum.EVECTION.getKey();
}else if (WorkForTimeEnum.OVERTIME_IN_CLASS.getKey().equals(workFor)){
bdlx = ClassSegmentTypeEnum.OVERTIME_IN_CLASS.getKey();
}
return bdlx;
}
/**
* 根据作用时段获得班段类型
* @param bdlx
* @return
*/
public static String getClassSegmenByWorkFor(String bdlx){
public static String getWorkFor(String bdlx){
String workFor="";
if (ClassSegmentTypeEnum.WORK_TIME.getKey().equals(bdlx)){
workFor = WorkForTimeEnum.WORK_TIME.getKey();
@ -643,6 +618,31 @@ public class Utils<T> {
return workFor;
}
/**
* 根据作用时段获得班段类型
* @param workFor
* @return
*/
public static String getClassSegmenByWorkFor(String workFor){
String bdlx="";
if (WorkForTimeEnum.WORK_TIME.getKey().equals(workFor)){
bdlx = ClassSegmentTypeEnum.WORK_TIME.getKey();
}else if (WorkForTimeEnum.DELAY_TO_WORK_OVERTIME.getKey().equals(workFor)){
bdlx = ClassSegmentTypeEnum.EXTENDED_OVERTIME.getKey();
}else if (WorkForTimeEnum.EARLY_TO_WORK_OVERTIME.getKey().equals(workFor)){
bdlx = ClassSegmentTypeEnum.EARLY_OVERTIME.getKey();
}else if (WorkForTimeEnum.PLAN_WORK_OVERTIME.getKey().equals(workFor)){
bdlx = ClassSegmentTypeEnum.OVERTIME_PLAN.getKey();
}else if (WorkForTimeEnum.LEAVE_TIME.getKey().equals(workFor)){
bdlx = ClassSegmentTypeEnum.ASK_FOR_LEAVE.getKey();
}else if (WorkForTimeEnum.EVECTION.getKey().equals(workFor)){
bdlx = ClassSegmentTypeEnum.EVECTION.getKey();
}else if (WorkForTimeEnum.OVERTIME_IN_CLASS.getKey().equals(workFor)){
bdlx = ClassSegmentTypeEnum.OVERTIME_IN_CLASS.getKey();
}
return bdlx;
}
/**
* 获得半天时间
* @param scheduleResult

Write Preview
Loading…
Cancel
Save