调整卡点

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

@@ -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

.idea/workspace.xml

@@ -10,33 +10,26 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="baeb3dfb-5097-46c5-933e-6d1dab18b815" name="Changes" comment="">
+      <change afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/AdjustClockPoint.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/dto/clockpoint/ClockPointInfo.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.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_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$/log/sdk.log" beforeDir="false" afterPath="$PROJECT_DIR$/log/sdk.log" 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$/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/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/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/dto/ClockPointDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/dto/clockpoint/ClockPointDTO.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/impl/AbnormalAttendanceServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/impl/AbnormalAttendanceServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/impl/ShiftServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/impl/ShiftServiceImpl.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/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/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/component/calendarscheduling/service/impl/WorkRulesServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/component/calendarscheduling/web/WorkRulesController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/component/calendarscheduling/web/WorkRulesController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/TestAttendanceAllowance/Test2.java" beforeDir="false" afterPath="$PROJECT_DIR$/test/TestAttendanceAllowance/Test2.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/commonutil/PersongroupCommonUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/commonutil/PersongroupCommonUtil.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/common/cmd/GetPersonDateBySuitOrganzation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/common/cmd/GetPersonDateBySuitOrganzation.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$/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/component/calendarscheduling/service/impl/WorkRulesServiceImpl$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl$1.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl$2.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl$2.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl$3.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl$3.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl$4.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl$4.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl$5.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl$5.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl$6.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl$6.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl$7.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl$7.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/calendarscheduling/web/WorkRulesController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/calendarscheduling/web/WorkRulesController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/commonutil/PersongroupCommonUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/commonutil/PersongroupCommonUtil.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/common/cmd/GetPersonDateBySuitOrganzation.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/common/cmd/GetPersonDateBySuitOrganzation.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/test-classes/calendarscheduling/TestgetDepartSchedule.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/calendarscheduling/TestgetDepartSchedule.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/calendarscheduling/TestgetDepartSchedule.java" beforeDir="false" afterPath="$PROJECT_DIR$/test/calendarscheduling/TestgetDepartSchedule.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -682,6 +675,7 @@
       <workItem from="1717724528067" duration="12939000" />
       <workItem from="1717743947608" duration="9652000" />
       <workItem from="1718070961854" duration="6848000" />
+      <workItem from="1718084052741" duration="4657000" />
     </task>
     <servers />
   </component>

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;

src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/AdjustClockPoint.java

@@ -0,0 +1,4 @@
+package com.engine.attendance.attendanceanalysis.cmd.getclockInpoint;
+
+public interface AdjustClockPoint {
+}

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;

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;

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<ClockPointDTO> clcokInPointList;
+    /**
+     * 班次集合
+     */
+    private List<Map<String, Object>> scheduleResult;
+    /**
+     * 班次集合
+     */
+    private List<Map<String, Object>> askForLeaveAndEvctionScheduleList;
+}

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;

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;

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;

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;

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;

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;

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.*;

src/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl.java

@@ -312,9 +312,13 @@ public class WorkRulesServiceImpl extends Service implements WorkRulesService {
     public List<Map<String,Object>> 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<Map<String,Object>> 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<monthDays;i++){
@@ -358,6 +366,7 @@ public class WorkRulesServiceImpl extends Service implements WorkRulesService {
             map.put("key",i+1);
             map.put("width",classWidth);
             map.put("isCalendar",0);
+            map.put("display","true");
             cloumns.add(map);
         }
 

test/TestAttendanceAllowance/Test2.java

@@ -1,14 +1,5 @@
 package TestAttendanceAllowance;
 
-import com.engine.attendance.attendanceanalysis.dto.ClockPointDTO;
-import com.engine.attendance.attendanceanalysis.web.AttendanceanalysisAction;
-import com.engine.attendance.enums.ClockPointEnum;
-import com.engine.common.util.DateUtil;
-import com.google.common.collect.Maps;
-
-import java.util.Calendar;
-import java.util.Map;
-
 public class Test2 {
     @org.junit.Test
     public void testAnalysis() throws Exception{