diff --git a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat index 58b42a4..7f359d2 100644 Binary files a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat and b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat differ diff --git a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values index 4eb285f..04ef7c5 100644 Binary files a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values and b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values differ diff --git a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.at b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.at index 460d760..3a43c80 100644 Binary files a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.at and b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.at differ diff --git a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s index 9b662de..61c4853 100644 --- a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s +++ b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s @@ -1 +1 @@ -y~|~~|}ƀ~}~|~}}}}~~}~}|}}qhjkjhjijkihlkopxutvvwv{xyxvxvyxzwvxې֐ߏ͎ڐΎڏČϐאˏčّݐޑяܐёގÑ̎ϏݏȔĐԏڎݍӐ̐ܓҏҎؐ˒͏Ѝ֐Џ̍ɑ͎͌ďې֎ɎߏΑ̏wssvswtsyltosqlqprlssusmoqrljZ\^\ZVZX\Vhwxzy{z|{xx|z|w{vy|VZUYSYX\Xace_WW^TRTTZW[T][WRWVZZUYQXWY[Zg~~z~{zy{x~|{~|}~}فad]h]a^a`a^_]]]^^^]]`kgggghc]Wkiqh \ No newline at end of file +y~|~~|}ƀ~}~|~}}}}~~}~}|}}qhjkjhjijkihlkopxutvvwv{xyxvxvyxzwvxې֐ߏ͎ڐΎڏČϐאˏčّݐޑяܐёގÑ̎ϏݏȔĐԏڎݍӐ̐ܓҏҎؐ˒͏Ѝ֐Џ̍ɑ͎͌ďې֎ɎߏΑ̏wssvswtsyltosqlqprlssusmoqrljZ\^\ZVZX\Vhwxzy{z|{xx|z|w{vy|VZUYSYX\Xace_WW^TRTTZW[T][WRWVZZUYQXWY[Zg~~z~{zy{x~|{~|}~}فad]h]a^a`a^_]]]^^^]]`kgggghc]WkiqhoLLLMMMMMMNMMMMMMMMMKKKKKJJJKKKLKKKKKKKKJJJKKKKKKKKKLKKKJJJKKKKLKKKKKKKKJIKKKKKKKKKKLKKJIJKKKKKLKKKKKKKJJJKKKKK \ No newline at end of file diff --git a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat_i b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat_i index 72c4f86..0acbac8 100644 Binary files a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat_i and b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat_i differ diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 0c18e9a..7df2fb4 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -10,33 +10,26 @@ + + + + - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + diff --git a/out/artifacts/hrm_attendance/hrm-attendance.jar b/out/artifacts/hrm_attendance/hrm-attendance.jar index 7eb0e32..b3a6e46 100644 Binary files a/out/artifacts/hrm_attendance/hrm-attendance.jar and b/out/artifacts/hrm_attendance/hrm-attendance.jar differ diff --git a/src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/AdjustByWorkOverTimeCmd.java b/src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/AdjustByWorkOverTimeCmd.java index 22fd91a..91a8973 100644 --- a/src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/AdjustByWorkOverTimeCmd.java +++ b/src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/AdjustByWorkOverTimeCmd.java @@ -1,6 +1,6 @@ package com.engine.attendance.attendanceanalysis.cmd.getclockInpoint; -import com.engine.attendance.attendanceanalysis.dto.ClockPointDTO; +import com.engine.attendance.attendanceanalysis.dto.clockpoint.ClockPointDTO; import com.engine.attendance.enums.ClassSegmentTypeEnum; import com.engine.attendance.enums.ClockPointEnum; import com.engine.common.biz.AbstractCommonCommand; diff --git a/src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/AdjustClockPoint.java b/src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/AdjustClockPoint.java new file mode 100644 index 0000000..1a51897 --- /dev/null +++ b/src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/AdjustClockPoint.java @@ -0,0 +1,4 @@ +package com.engine.attendance.attendanceanalysis.cmd.getclockInpoint; + +public interface AdjustClockPoint { +} diff --git a/src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/GetClockInPointCmd.java b/src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/GetClockInPointCmd.java index dfb60a5..12df253 100644 --- a/src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/GetClockInPointCmd.java +++ b/src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/GetClockInPointCmd.java @@ -1,6 +1,6 @@ package com.engine.attendance.attendanceanalysis.cmd.getclockInpoint; -import com.engine.attendance.attendanceanalysis.dto.ClockPointDTO; +import com.engine.attendance.attendanceanalysis.dto.clockpoint.ClockPointDTO; import com.engine.attendance.enums.AccountingUnitEnum; import com.engine.attendance.enums.CheckBoxEnum; import com.engine.attendance.enums.ClassSegmentTypeEnum; @@ -17,7 +17,6 @@ import weaver.general.Util; import java.time.ZoneOffset; import java.util.Comparator; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; diff --git a/src/com/engine/attendance/attendanceanalysis/dto/ClockPointDTO.java b/src/com/engine/attendance/attendanceanalysis/dto/clockpoint/ClockPointDTO.java similarity index 94% rename from src/com/engine/attendance/attendanceanalysis/dto/ClockPointDTO.java rename to src/com/engine/attendance/attendanceanalysis/dto/clockpoint/ClockPointDTO.java index 60a18fa..14bf62f 100644 --- a/src/com/engine/attendance/attendanceanalysis/dto/ClockPointDTO.java +++ b/src/com/engine/attendance/attendanceanalysis/dto/clockpoint/ClockPointDTO.java @@ -1,4 +1,4 @@ -package com.engine.attendance.attendanceanalysis.dto; +package com.engine.attendance.attendanceanalysis.dto.clockpoint; import com.engine.attendance.enums.ClockPointEnum; import lombok.AllArgsConstructor; diff --git a/src/com/engine/attendance/attendanceanalysis/dto/clockpoint/ClockPointInfo.java b/src/com/engine/attendance/attendanceanalysis/dto/clockpoint/ClockPointInfo.java new file mode 100644 index 0000000..c08a968 --- /dev/null +++ b/src/com/engine/attendance/attendanceanalysis/dto/clockpoint/ClockPointInfo.java @@ -0,0 +1,31 @@ +package com.engine.attendance.attendanceanalysis.dto.clockpoint; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; +import java.util.Map; + +/** + * 卡点相关信息类 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class ClockPointInfo { + /** + * 卡点集合 + */ + private List clcokInPointList; + /** + * 班次集合 + */ + private List> scheduleResult; + /** + * 班次集合 + */ + private List> askForLeaveAndEvctionScheduleList; +} diff --git a/src/com/engine/attendance/attendanceanalysis/service/UtilService.java b/src/com/engine/attendance/attendanceanalysis/service/UtilService.java index e39e234..9b29639 100644 --- a/src/com/engine/attendance/attendanceanalysis/service/UtilService.java +++ b/src/com/engine/attendance/attendanceanalysis/service/UtilService.java @@ -1,6 +1,6 @@ package com.engine.attendance.attendanceanalysis.service; -import com.engine.attendance.attendanceanalysis.dto.ClockPointDTO; +import com.engine.attendance.attendanceanalysis.dto.clockpoint.ClockPointDTO; import java.util.List; import java.util.Map; diff --git a/src/com/engine/attendance/attendanceanalysis/service/impl/AbnormalAttendanceServiceImpl.java b/src/com/engine/attendance/attendanceanalysis/service/impl/AbnormalAttendanceServiceImpl.java index bff0def..ad21aac 100644 --- a/src/com/engine/attendance/attendanceanalysis/service/impl/AbnormalAttendanceServiceImpl.java +++ b/src/com/engine/attendance/attendanceanalysis/service/impl/AbnormalAttendanceServiceImpl.java @@ -1,7 +1,7 @@ package com.engine.attendance.attendanceanalysis.service.impl; import com.engine.attendance.attendanceanalysis.cmd.item.*; -import com.engine.attendance.attendanceanalysis.dto.ClockPointDTO; +import com.engine.attendance.attendanceanalysis.dto.clockpoint.ClockPointDTO; import com.engine.attendance.attendanceanalysis.service.AbnormalAttendanceService; import com.engine.attendance.enums.*; import com.engine.common.util.Utils; diff --git a/src/com/engine/attendance/attendanceanalysis/service/impl/ShiftServiceImpl.java b/src/com/engine/attendance/attendanceanalysis/service/impl/ShiftServiceImpl.java index 0f001e0..453e7bd 100644 --- a/src/com/engine/attendance/attendanceanalysis/service/impl/ShiftServiceImpl.java +++ b/src/com/engine/attendance/attendanceanalysis/service/impl/ShiftServiceImpl.java @@ -1,6 +1,6 @@ package com.engine.attendance.attendanceanalysis.service.impl; -import com.engine.attendance.attendanceanalysis.dto.ClockPointDTO; +import com.engine.attendance.attendanceanalysis.dto.clockpoint.ClockPointDTO; import com.engine.attendance.attendanceanalysis.service.ShiftService; import com.engine.attendance.attendanceanalysis.service.UtilService; import com.engine.attendance.attendanceanalysis.wrapper.UpdateAttendanceResultWrapper; diff --git a/src/com/engine/attendance/attendanceanalysis/service/impl/UtilServiceImpl.java b/src/com/engine/attendance/attendanceanalysis/service/impl/UtilServiceImpl.java index 49b2cb0..5bce46e 100644 --- a/src/com/engine/attendance/attendanceanalysis/service/impl/UtilServiceImpl.java +++ b/src/com/engine/attendance/attendanceanalysis/service/impl/UtilServiceImpl.java @@ -3,14 +3,13 @@ package com.engine.attendance.attendanceanalysis.service.impl; import com.engine.attendance.attendanceanalysis.cmd.*; import com.engine.attendance.attendanceanalysis.cmd.getclockInpoint.AdjustByWorkOverTimeCmd; import com.engine.attendance.attendanceanalysis.cmd.getclockInpoint.GetClockInPointCmd; -import com.engine.attendance.attendanceanalysis.dto.ClockPointDTO; +import com.engine.attendance.attendanceanalysis.dto.clockpoint.ClockPointDTO; import com.engine.attendance.attendanceanalysis.service.UtilService; import com.engine.attendance.component.persongroup.service.SchedulingResultsService; import com.engine.attendance.component.persongroup.service.impl.SchedulingResultsServiceImpl; import com.engine.attendance.enums.*; import com.engine.common.util.DateUtil; import com.engine.common.util.ServiceUtil; -import com.engine.common.util.Utils; import com.engine.core.impl.Service; import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; diff --git a/src/com/engine/attendance/attendanceanalysis/service/impl/WorkOverTimeServiceImpl.java b/src/com/engine/attendance/attendanceanalysis/service/impl/WorkOverTimeServiceImpl.java index f8c9d27..4d48c9d 100644 --- a/src/com/engine/attendance/attendanceanalysis/service/impl/WorkOverTimeServiceImpl.java +++ b/src/com/engine/attendance/attendanceanalysis/service/impl/WorkOverTimeServiceImpl.java @@ -3,17 +3,15 @@ package com.engine.attendance.attendanceanalysis.service.impl; import com.engine.attendance.attendanceanalysis.cmd.workovertime.GetOvertimeDurationCmd; import com.engine.attendance.attendanceanalysis.cmd.item.WorkOvertimeItemCmd; import com.engine.attendance.attendanceanalysis.cmd.workovertime.SaveWorkOverTimeCmd; -import com.engine.attendance.attendanceanalysis.dto.ClockPointDTO; +import com.engine.attendance.attendanceanalysis.dto.clockpoint.ClockPointDTO; import com.engine.attendance.attendanceanalysis.service.WorkOverTimeService; import com.engine.attendance.enums.*; import com.engine.common.util.DateUtil; -import com.engine.common.util.DbTools; import com.engine.common.util.Utils; import com.engine.core.impl.Service; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; -import weaver.general.TimeUtil; import weaver.general.Util; import java.time.ZoneOffset; diff --git a/src/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.java b/src/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.java index 15f37b5..0e6789d 100644 --- a/src/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.java +++ b/src/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.java @@ -1,11 +1,10 @@ package com.engine.attendance.attendanceanalysis.wrapper; -import com.engine.attendance.attendanceanalysis.dto.ClockPointDTO; +import com.engine.attendance.attendanceanalysis.dto.clockpoint.ClockPointDTO; import com.engine.attendance.attendanceanalysis.service.ComprehensiveWorkingHourService; import com.engine.attendance.attendanceanalysis.service.UtilService; import com.engine.attendance.attendanceanalysis.service.impl.ComprehensiveWorkingHourServiceImpl; import com.engine.attendance.attendanceanalysis.service.impl.UtilServiceImpl; -import com.engine.attendance.enums.AttendanceItemTypeEnum; import com.engine.attendance.enums.CheckBoxEnum; import com.engine.common.util.CommonUtil; import com.engine.common.util.DateUtil; @@ -15,12 +14,10 @@ import com.engine.core.impl.Service; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; -import org.apache.struts.tiles.xmlDefinition.I18nFactorySet; import weaver.general.Util; import java.time.ZoneOffset; import java.util.Comparator; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; diff --git a/src/com/engine/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.java b/src/com/engine/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.java index 3fffec8..a8cbcc9 100644 --- a/src/com/engine/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.java +++ b/src/com/engine/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.java @@ -1,7 +1,7 @@ package com.engine.attendance.attendanceanalysis.wrapper; -import com.engine.attendance.attendanceanalysis.dto.ClockPointDTO; +import com.engine.attendance.attendanceanalysis.dto.clockpoint.ClockPointDTO; import com.engine.attendance.attendanceanalysis.service.*; import com.engine.attendance.attendanceanalysis.service.impl.*; import com.engine.attendance.enums.*; diff --git a/src/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl.java b/src/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl.java index 92c899e..428e04b 100644 --- a/src/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl.java +++ b/src/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl.java @@ -312,9 +312,13 @@ public class WorkRulesServiceImpl extends Service implements WorkRulesService { public List> getCloumns(int monthDays,String startTime){ BaseBean bb = new BaseBean(); String numberWidth = bb.getPropValue("jclAttendance", "numberWidth"); + String numberDisplay = bb.getPropValue("jclAttendance", "numberDisplay"); String nameWidth = bb.getPropValue("jclAttendance", "nameWidth"); - String subcompantWidth = bb.getPropValue("jclAttendance", "subcompantWidth"); + String nameDisplay = bb.getPropValue("jclAttendance", "nameDisplay"); + String subcompantWidth = bb.getPropValue("jclAttendance", "subcompanyWidth"); + String subcompanyDisplay = bb.getPropValue("jclAttendance", "subcompanyDisplay"); String departmentWidth = bb.getPropValue("jclAttendance", "departmentWidth"); + String departmentDisplay = bb.getPropValue("jclAttendance", "departmentDisplay"); String classWidth = bb.getPropValue("jclAttendance", "classWidth"); List> cloumns = Lists.newArrayList(); @@ -325,6 +329,7 @@ public class WorkRulesServiceImpl extends Service implements WorkRulesService { put("key","workcode"); put("fixed","left"); put("align","center"); + put("display",numberDisplay); }}); cloumns.add(new HashMap(){{ put("title","姓名"); @@ -333,6 +338,7 @@ public class WorkRulesServiceImpl extends Service implements WorkRulesService { put("key","lastname"); put("fixed","left"); put("align","center"); + put("display",nameDisplay); }}); cloumns.add(new HashMap(){{ put("title","分部"); @@ -341,6 +347,7 @@ public class WorkRulesServiceImpl extends Service implements WorkRulesService { put("key","subcompany"); put("fixed","left"); put("align","center"); + put("display",subcompanyDisplay); }}); cloumns.add(new HashMap(){{ put("title","部门"); @@ -349,6 +356,7 @@ public class WorkRulesServiceImpl extends Service implements WorkRulesService { put("key","department"); put("fixed","left"); put("align","center"); + put("display",departmentDisplay); }}); for (int i=0;i