liuliang

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

@@ -1 +1 @@
-聡
饉羳
纜駗詝騷鐈踸蟸蘽襹靫觹魘蓒魗詝飦
錡郳荴㘎鱑芚鉘蝀蔤轠譠鶷賄酫馳鏨韀鈀鬠襔蘓覺襊荱鍿羃輁颲萪羍裝鮚鉛蚛鶹蟅霶蔥錟郬蚠饌
䎬苮鄖鴘鎩髙䓖鴚觵鼂鱷詘褅脃鍃葁輛鸚颴衆黊酼骙<EFBFBD>[遊鯹覽誟鷑豯韙餺踤莖靤鰏聎蘰胣辴羙詐鷎輖鰍髈鎡蟣鼁蟫魐蛅莡誸饁鑤賦詪
鴰
輳
聭
虖
聫
蠋
迬
飸
䦟
顝
蓯
藧
驇
袕
蹘
鎺
讕
駪
藧
鼛
脨
翉
葠
麘
䦛
釋
覑
茝
蠋
軗
謵
頀
鎻
鐞
蛽
缼
鐝
褢
貜
蕦
鶒
藨
螑
趲
蓴
韼
蠋
顛
讘
脫
輲
輳
蠍
趰
顜
鶑
顜
魬
鎼
軕
蕩
贀
菕
駩
茞
銖
䦶
飶
輴
蛽
脪
麖
鷳
鞁
艗
蛷
鴳
鎾
釐
蠍
謷
驉
鈱
鯇
訍
<EFBFBD><EFBFBD>
趶
迯
褣
閻
膽
鞆
鰩
霃
蹘
話
鋻
邘
鏀
銘
鞈
邟
鰢
蕏閟踴讀鎥鱱鄕詖輜鱵觵顆靫騰鉽膙鴙鹵聎閧蟤躰羖錳阨説纋鷉襨裪踙鵯羕騤黭辴麀鵿賬賬蕔蘽鄛趠<EFBFBD><EFBFBD>饈<EFBFBD><EFBFBD>鼃醻<EFBFBD>醻藑<EFBFBD>觹雫<EFBFBD>饉軀鱺<EFBFBD>醻<EFBFBD>蘿<EFBFBD>脅<EFBFBD>繬镸闙闙镸霱闙闙鍹罭隡頜臡郘荓螸鞮螹頜餗鐹錕鐺鍷鏚鍷錕鍷鉑鉑逰郕繨蔎蚄鉑鍷錕鍷釱銴袻鉑鏚鏚鍷郖鉐繨逬逰錕諰鉑鉑銴鏚鏚鏚錕鏚錕﨡蘆齀鮆鏚銴鍷鐺釱錕鉑襆銴錕鉑鏚鶭罦蒍臟鐺釱螸銴鉑鍷錕鐺錕鍷銴錕鐹翵躂貹釱鏚闗錕鉑鉑鍷訪錕錕鏚蜬
+聡
饉羳
纜駗詝騷鐈踸蟸蘽襹靫觹魘蓒魗詝飦
錡郳荴㘎鱑芚鉘蝀蔤轠譠鶷賄酫馳鏨韀鈀鬠襔蘓覺襊荱鍿羃輁颲萪羍裝鮚鉛蚛鶹蟅霶蔥錟郬蚠饌
䎬苮鄖鴘鎩髙䓖鴚觵鼂鱷詘褅脃鍃葁輛鸚颴衆黊酼骙<EFBFBD>[遊鯹覽誟鷑豯韙餺踤莖靤鰏聎蘰胣辴羙詐鷎輖鰍髈鎡蟣鼁蟫魐蛅莡誸饁鑤賦詪
鴰
輳
聭
虖
聫
蠋
迬
飸
䦟
顝
蓯
藧
驇
袕
蹘
鎺
讕
駪
藧
鼛
脨
翉
葠
麘
䦛
釋
覑
茝
蠋
軗
謵
頀
鎻
鐞
蛽
缼
鐝
褢
貜
蕦
鶒
藨
螑
趲
蓴
韼
蠋
顛
讘
脫
輲
輳
蠍
趰
顜
鶑
顜
魬
鎼
軕
蕩
贀
菕
駩
茞
銖
䦶
飶
輴
蛽
脪
麖
鷳
鞁
艗
蛷
鴳
鎾
釐
蠍
謷
驉
鈱
鯇
訍
<EFBFBD><EFBFBD>
趶
迯
褣
閻
膽
鞆
鰩
霃
蹘
話
鋻
邘
鏀
銘
鞈
邟
鰢
蕏閟踴讀鎥鱱鄕詖輜鱵觵顆靫騰鉽膙鴙鹵聎閧蟤躰羖錳阨説纋鷉襨裪踙鵯羕騤黭辴麀鵿賬賬蕔蘽鄛趠<EFBFBD><EFBFBD>饈<EFBFBD><EFBFBD>鼃醻<EFBFBD>醻藑<EFBFBD>觹雫<EFBFBD>饉軀鱺<EFBFBD>醻<EFBFBD>蘿<EFBFBD>脅

.idea/workspace.xml

@@ -10,55 +10,27 @@
   </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/GetScheduleResultListCmd.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/test/TestAttendanceAllowance/Test2.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.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/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/WEB-INF/prop/weaver.properties" beforeDir="false" afterPath="$PROJECT_DIR$/WEB-INF/prop/weaver.properties" 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$/log/sdk.log" beforeDir="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/ComputeAttendanceDurationCmd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/ComputeAttendanceDurationCmd.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/GetScheduleResultListCmd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/GetScheduleResultListCmd.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/GetAskForLeaveCmd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/GetAskForLeaveCmd.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/GetClockInTimeListCmd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/GetClockInTimeListCmd.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/GetEvectionCmd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/GetEvectionCmd.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/RecordDataCmd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/RecordDataCmd.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/UpdateAttendanceResultsCmd.java" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/AdjustByWorkOverTimeCmd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/AdjustByWorkOverTimeCmd.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/GetClockInPointCmd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/GetClockInPointCmd.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/ShiftService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/ShiftService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/item/BeAwayItemCmd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/item/BeAwayItemCmd.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/dto/ClockPointDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/dto/ClockPointDTO.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/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/AllowanceServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/impl/AllowanceServiceImpl.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/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/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/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/ComputeAttendanceDurationCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/cmd/ComputeAttendanceDurationCmd.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/cmd/GetAskForLeaveCmd$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/cmd/GetAskForLeaveCmd$1.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/cmd/GetAskForLeaveCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/cmd/GetAskForLeaveCmd.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/cmd/GetClockInTimeListCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/cmd/GetClockInTimeListCmd.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/cmd/GetEvectionCmd$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/cmd/GetEvectionCmd$1.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/cmd/GetEvectionCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/cmd/GetEvectionCmd.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/cmd/UpdateAttendanceResultsCmd.class" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/AdjustByWorkOverTimeCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/AdjustByWorkOverTimeCmd.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/GetClockInPointCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/GetClockInPointCmd.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/service/impl/AbnormalAttendanceServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/service/impl/AbnormalAttendanceServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/cmd/recordDataCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/cmd/recordDataCmd.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/dto/ClockPointDTO$ClockPointDTOBuilder.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/dto/ClockPointDTO$ClockPointDTOBuilder.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/dto/ClockPointDTO.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/dto/ClockPointDTO.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/service/impl/AllowanceServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/service/impl/AllowanceServiceImpl.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/service/impl/WorkOverTimeServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/service/impl/WorkOverTimeServiceImpl.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.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/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/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper$1.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/service/impl/AttendanceSummaryServiceImpl$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/workflow/service/impl/AttendanceSummaryServiceImpl$1.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/workflow/service/impl/AttendanceSummaryServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/workflow/service/impl/AttendanceSummaryServiceImpl.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/TestAttendanceAllowance/Test.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/TestAttendanceAllowance/Test.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/test/TestAttendanceAllowance/Test.java" beforeDir="false" afterPath="$PROJECT_DIR$/test/TestAttendanceAllowance/Test.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -102,7 +74,7 @@
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File" value="PLAIN_TEXT" />
     <property name="last_directory_selection" value="$PROJECT_DIR$/src/com/engine/kq" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../浩鲸项目/haojing" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../../easyentry" />
     <property name="nodejs_package_manager_path" value="npm" />
     <property name="project.structure.last.edited" value="Artifacts" />
     <property name="project.structure.proportion" value="0.15" />
@@ -648,7 +620,10 @@
       <workItem from="1715750795223" duration="1391000" />
       <workItem from="1715752378133" duration="18584000" />
       <workItem from="1715822142239" duration="6885000" />
-      <workItem from="1715837102628" duration="16034000" />
+      <workItem from="1715837102628" duration="19500000" />
+      <workItem from="1715909515931" duration="5482000" />
+      <workItem from="1715923672642" duration="9625000" />
+      <workItem from="1716168995101" duration="7106000" />
     </task>
     <servers />
   </component>
@@ -688,14 +663,24 @@
           <option name="timeStamp" value="99" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/impl/WorkOverTimeServiceImpl.java</url>
+          <url>file://$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/impl/AllowanceServiceImpl.java</url>
-          <line>312</line>
+          <line>26</line>
-          <option name="timeStamp" value="122" />
+          <option name="timeStamp" value="127" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/impl/WorkOverTimeServiceImpl.java</url>
+          <url>file://$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.java</url>
-          <line>304</line>
+          <line>122</line>
-          <option name="timeStamp" value="123" />
+          <option name="timeStamp" value="130" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.java</url>
+          <line>157</line>
+          <option name="timeStamp" value="142" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/impl/ShiftServiceImpl.java</url>
+          <line>204</line>
+          <option name="timeStamp" value="143" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -718,7 +703,7 @@
     </watches-manager>
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
-    <SUITE FILE_PATH="coverage/hrm_attendance$Test_testAnalysis.ic" NAME="Test.testAnalysis Coverage Results" MODIFIED="1714448541923" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
+    <SUITE FILE_PATH="coverage/hrm_attendance$Test_testAnalysis.ic" NAME="Test.testAnalysis Coverage Results" MODIFIED="1716174480378" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
       <FILTER>TestAttendanceAllowance.*</FILTER>
     </SUITE>
     <SUITE FILE_PATH="coverage/hrm_attendance$Test1_test1.ic" NAME="Test1.test1 Coverage Results" MODIFIED="1714384548356" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">

src/com/engine/attendance/attendanceanalysis/cmd/GetScheduleResultListCmd.java

@@ -1,17 +1,18 @@
 package com.engine.attendance.attendanceanalysis.cmd;
 
 import com.engine.attendance.attendanceanalysis.cmd.item.WorkOvertimeItemCmd;
+import com.engine.attendance.attendanceanalysis.service.ShiftService;
+import com.engine.attendance.attendanceanalysis.service.impl.ShiftServiceImpl;
 import com.engine.attendance.enums.CheckBoxEnum;
 import com.engine.attendance.enums.ClassBelongToEnum;
 import com.engine.attendance.enums.ClassSegmentTypeEnum;
 import com.engine.attendance.enums.WorkForTimeEnum;
 import com.engine.common.biz.AbstractCommonCommand;
-import com.engine.common.cmd.GetDateCmd;
 import com.engine.common.entity.BizLogContext;
 import com.engine.common.util.DateUtil;
 import com.engine.common.util.DbTools;
+import com.engine.common.util.ServiceUtil;
 import com.engine.common.util.Utils;
-import com.engine.core.context.Context;
 import com.engine.core.interceptor.CommandContext;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -24,9 +25,11 @@ import java.util.stream.Collectors;
 
 /**
  * 获得班次结果
+ * 这边改了代码，ShiftServiceImpl的getSchedulingInFormation方法打卡匹配班次类也得跟着变，里面有相同逻辑
  */
 @Slf4j
 public class GetScheduleResultListCmd extends AbstractCommonCommand<Map<String,Object>> {
+    private ShiftService basicsetService = ServiceUtil.getService(ShiftServiceImpl.class);
 
     public GetScheduleResultListCmd(Map<String,Object> params){
         this.params=params;
@@ -44,13 +47,16 @@ public class GetScheduleResultListCmd extends AbstractCommonCommand<Map<String,O
         Map<String,Object> schedulingResultsMap = (Map<String,Object>)params.get("schedulingResultsMap");
         List<Map<String,Object>> schedulingResultsList = (List<Map<String,Object>>)schedulingResultsMap.get("data");
         schedulingResultsList = Utils.getSchedulingList(schedulingResultsList);
+        //去除候选班组
+        List<Map<String,Object>> candidateSchedulingResultsList  = schedulingResultsList.stream().filter(e->!"".equals(Util.null2String(e.get("hxbz"))) && "".equals(Util.null2String(e.get("bcxx")))).collect(Collectors.toList());
+        schedulingResultsList = schedulingResultsList.stream().filter(e->!"".equals(Util.null2String(e.get("bcxx")))).collect(Collectors.toList());
+
         Map<String,Object> schedulMap = Maps.newHashMap();
         String glpb = "";
-        if (schedulingResultsList.size() >0){
+        for (Map<String,Object> schedulingResult:schedulingResultsList){
-            glpb = Util.null2String(schedulingResultsList.get(0).get("pbgl"));
+            glpb = Util.null2String(schedulingResult.get("pbgl"));
         }
-        //schedulingResultsList = schedulingResultsList.stream().filter(e -> !"1".equals(e.get("sfxx"))).collect(Collectors.toList());
+
-        //  Map<String,String> schedulingMap = schedulingResultsList.stream().collect(Collectors.toMap(e-> Util.null2String(e.get("bcxx")).split("-")[0], e->Util.null2String(e.get("bcrq"))+"&"+Util.null2String(e.get("rqlx"))));
         Map<String,List<Map<String,Object>>> schedulingMap = schedulingResultsList.stream().collect(Collectors.groupingBy(e-> Util.null2String(e.get("bcxx")).split("-")[0]));
         Map<String,List<Map<String,Object>>> schedulingMapBydate = schedulingResultsList.stream().collect(Collectors.groupingBy(e-> Util.null2String(e.get("bcrq"))));
         schedulMap.put("schedulingMapBydate",schedulingMapBydate);
@@ -84,13 +90,20 @@ public class GetScheduleResultListCmd extends AbstractCommonCommand<Map<String,O
                         newMap.putAll(map);
                         newMap.put("rqlx",rqlx);
                         newMap.put("sfxx",sfxx);
-                        //adjustWorkOverTimeClass(newMap, finalAttendanceItems,commandContext);
+                        adjustWorkOverTimeClass(newMap, finalAttendanceItems,commandContext);
                         classs.add(newMap);
                     }
                     resultMap.put(bcrq,classs);
                 }
             });
         }
+        /**
+         * 候选班组
+         */
+        for (Map<String,Object> candidateSchedulingResult:candidateSchedulingResultsList){
+            Map<String, Object> shiftResult = basicsetService.punchMatchShift(params.get("pbdx").toString(),candidateSchedulingResult,(List<Map<String,Object>>)params.get("clockInData"),(Map<String,Map<String,Object>>)params.get("clockInTimeMap"));
+            resultMap.put(shiftResult.get("bcrq").toString(),(List<Map<String,Object>>)shiftResult.get("bcData"));
+        }
 
         /** 加班计划*/
         sql = "select b.jbry,b.ksrq,b.kssj,a.jblx,b.jsrq,b.jssj,b.jbsc from uf_jcl_kq_jbjh a left join uf_jcl_kq_jbjh_dt1 b on a.id=b.mainid where b.jbry =? and b.ksrq>=? and b.ksrq<=? and (b.jbcx=0 or b.jbcx is null)";
@@ -250,18 +263,23 @@ public class GetScheduleResultListCmd extends AbstractCommonCommand<Map<String,O
                 workTimeBeItems = (List<Map<String,Object>>)result.get("attendanceItems");
             }
             if (workTimeBeItems.size() > 0){
-                //开始加班必须打卡
+                int tqdkfzs = Integer.valueOf(Util.null2String(scheduleMap.get("tqdkfzs")).equals("")?"0":Util.null2String(scheduleMap.get("tqdkfzs")));
-                String ksjbbxydk = Util.null2String(workTimeBeItems.get(0).get("ksjbbxydk"));
+                int thdkfzs = Integer.valueOf(Util.null2String(scheduleMap.get("thdkfzs")).equals("")?"0":Util.null2String(scheduleMap.get("thdkfzs")));
-                if (ksjbbxydk.equals(CheckBoxEnum.CHECKED.getKey())){
+                int tqdkyxfzs = Integer.valueOf(workTimeBeItems.get(0).get("tqdkyxfzs").toString());
-                    scheduleMap.put("ksdk",CheckBoxEnum.CHECKED.getKey());
+                int thdkyxfzs = Integer.valueOf(workTimeBeItems.get(0).get("thdkyxfzs").toString());
+
+                if (tqdkyxfzs > tqdkfzs){
+                    //提前打卡分钟数
+                    scheduleMap.put("tqdkfzs",workTimeBeItems.get(0).get("tqdkyxfzs"));
                 }
-                //结束加班必须打卡
+                if (thdkyxfzs > thdkfzs){
-                String jsjbbxydk = Util.null2String(workTimeBeItems.get(0).get("jsjbbxydk"));
+                    //推后打卡分钟数
-                if (jsjbbxydk.equals(CheckBoxEnum.CHECKED.getKey())){
+                    scheduleMap.put("thdkfzs",workTimeBeItems.get(0).get("thdkyxfzs"));
-                    scheduleMap.put("jsdk",CheckBoxEnum.CHECKED.getKey());
                 }
             }
         }
     }
 
+
+
 }

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

@@ -110,7 +110,7 @@ public class AdjustByWorkOverTimeCmd extends AbstractCommonCommand<Map<String, O
             }
         }
 
-        String beforeClassSegment = scheduleMap.get("bdlx").toString();
+        String beforeClassSegment = beforeScheduleMap.get("bdlx").toString();
         String clockTime = clockTimeMap == null?"" : clockTimeMap.get("signdate")+" "+clockTimeMap.get("signtime");
 
 
@@ -146,7 +146,7 @@ public class AdjustByWorkOverTimeCmd extends AbstractCommonCommand<Map<String, O
         Map<String, Object> afterScheduleMap = scheduleResult.get(scheduleIndex+1);
         String dtjssj = Utils.getjssjTime(scheduleMap,analysisDate);
         String afterDtkssj = Utils.getkssjTime(afterScheduleMap,analysisDate);
-        String afterClassSegment = scheduleMap.get("bdlx").toString();
+        String afterClassSegment = afterScheduleMap.get("bdlx").toString();
         String clockTime = clockTimeMap == null?"" : clockTimeMap.get("signdate")+" "+clockTimeMap.get("signtime");
         ClockPointDTO nowclockPointDTO = null;
         for (ClockPointDTO clockPointDTO :clcokInPointList){

src/com/engine/attendance/attendanceanalysis/service/ShiftService.java

@@ -5,5 +5,12 @@ import java.util.Map;
 
 public interface ShiftService {
 
-    Map<String, Object> punchMatchShift(String empId, String schedulingResultId, List<Map<String, Object>> clockInData);
+    /**
+     * 打卡匹配班次
+     * @param empId
+     * @param pbData 排班结果
+     * @param clockInData
+     * @return
+     */
+    Map<String, Object> punchMatchShift(String empId, Map<String,Object> pbData, List<Map<String, Object>> clockInData,Map<String,Map<String,Object>> clockInTimeMap);
 }

src/com/engine/attendance/attendanceanalysis/service/impl/AbnormalAttendanceServiceImpl.java

@@ -80,6 +80,7 @@ public class AbnormalAttendanceServiceImpl extends Service implements AbnormalAt
                 workTimeBeLateItems.get(0).put("kczgsc",CheckBoxEnum.CHECKED.getKey());
                 workTimeBeLateItems.get(0).put("qbkcsc","1");
                 workTimeBeLateItems.get(0).put("cckcbc","1");
+
             }
             if (workTimeBeLateItems.size() > 0){
                 Map<String,Object> saveWorkTimeBeLateParam = Maps.newHashMap();
@@ -137,7 +138,7 @@ public class AbnormalAttendanceServiceImpl extends Service implements AbnormalAt
             if (workTimeItems.size() > 0 && lateItems.size() >0){
                 double hsl = Double.valueOf(Util.null2String(lateItems.get(0).get("hsl")));
                 String hsdw = Util.null2String(lateItems.get(0).get("hsdw"));
-                String jbwdhlfzs = Util.null2String(workTimeItems.get(0).get("jbwdhlfzs"));
+                String jbwdhlfzs = Util.null2String(workTimeItems.get(0).get("jbwdhlfzs")).equals("")?"0":Util.null2String(workTimeItems.get(0).get("jbwdhlfzs"));
                 if (!"".equals(jbwdhlfzs) && between > Integer.valueOf(jbwdhlfzs)){
                     Map<String,Object> saveWorkTimeBeLateParam = Maps.newHashMap();
                     String kczgsc = Util.null2String(lateItems.get(0).get("kczgsc"));
@@ -331,7 +332,7 @@ public class AbnormalAttendanceServiceImpl extends Service implements AbnormalAt
             }
             List<Map<String,Object>> beEarlyItems = getBeEarlyItems(earlyParams);
             if (workTimeItems.size() > 0 && beEarlyItems.size() >0){
-                String jbzzhlfzs = Util.null2String(workTimeItems.get(0).get("jbzzhlfzs"));
+                String jbzzhlfzs = Util.null2String(workTimeItems.get(0).get("jbzzhlfzs")).equals("")?"0":Util.null2String(workTimeItems.get(0).get("jbzzhlfzs"));
                 String hsdw = Util.null2String(beEarlyItems.get(0).get("hsdw"));
                 double hsl = Double.valueOf(Util.null2String(beEarlyItems.get(0).get("hsl")));
                 if (!"".equals(jbzzhlfzs) && between > Integer.valueOf(jbzzhlfzs)){
@@ -435,6 +436,7 @@ public class AbnormalAttendanceServiceImpl extends Service implements AbnormalAt
             workTimeBeLateItems.get(0).put("kczgsc",CheckBoxEnum.CHECKED.getKey());
             workTimeBeLateItems.get(0).put("qbkcsc","1");
             workTimeBeLateItems.get(0).put("cckcbc","1");
+
         }
         return workTimeBeLateItems;
     }
@@ -454,6 +456,7 @@ public class AbnormalAttendanceServiceImpl extends Service implements AbnormalAt
             workTimeBeLateItems.get(0).put("kczgsc",CheckBoxEnum.CHECKED.getKey());
             workTimeBeLateItems.get(0).put("qbkcsc","1");
             workTimeBeLateItems.get(0).put("cckcbc","1");
+
         }
         return workTimeBeLateItems;
     }

src/com/engine/attendance/attendanceanalysis/service/impl/ShiftServiceImpl.java

@@ -38,16 +38,16 @@ public class ShiftServiceImpl extends Service implements ShiftService {
     /**
      * 打卡匹配班次，返回班次id
      * @param empId 打卡人员id
-     * @param schedulingResultId 排班结果主表数据id
+     * @param pbData 排班结果
      * @param clockInData 需要包含分析日期以及分析日期前后2天的3天原始打卡数据
      * @return
      */
     @Override
-    public Map<String, Object> punchMatchShift(String empId, String schedulingResultId, List<Map<String, Object>> clockInData) {
+    public Map<String, Object> punchMatchShift(String empId, Map<String,Object> pbData, List<Map<String, Object>> clockInData,Map<String,Map<String,Object>> clockInTimeMap) {
         //查询排班结果
-        String pbSql = "select * from uf_pbjg where id = " + schedulingResultId;
+//        String pbSql = "select * from uf_pbjg where id = " + schedulingResultId;
-        Map<String, Object> pbData = DbTools.getSqlToMap(pbSql);
+//        Map<String, Object> pbData = DbTools.getSqlToMap(pbSql);
-        String shiftTeamId = Util.null2String(pbData.get("hxbz"));
+        String shiftTeamId = Util.null2String(pbData.get("hxbz")).split("-")[0];
         String punchDate = Util.null2String(pbData.get("bcrq"));
 
         Map<String, Object> result = null;
@@ -61,7 +61,7 @@ public class ShiftServiceImpl extends Service implements ShiftService {
                 //循环匹配，输出匹配结果
                 for (Map<String, Object> bcMap : bcData) {
                     //获取班次要求打卡数据和请假、出差、加班数据处理后的卡点数据
-                    Map<String, Object> waitCompareMap = dealClockInData(empId, pbData, clockInData, bcMap.get("bcxx").toString());
+                    Map<String, Object> waitCompareMap = dealClockInData(empId, pbData, clockInData, bcMap.get("bcxx").toString(), clockInTimeMap);
                     waitCompareMap.put("priorityValue", Util.null2String(bcMap.get("yxj")));
                     waitCompareResultList.add(waitCompareMap);
                 }
@@ -225,7 +225,7 @@ public class ShiftServiceImpl extends Service implements ShiftService {
      * @param clockInData 需要包含分析日期以及分析日期前后2天的3天打卡数据
      * @return
      */
-    private Map<String, Object> dealClockInData(String empId, Map<String, Object> pbData, List<Map<String, Object>> clockInData, String shiftId) {
+    private Map<String, Object> dealClockInData(String empId, Map<String, Object> pbData, List<Map<String, Object>> clockInData, String shiftId,Map<String,Map<String,Object>> clockInTimeMap) {
         Map<String, Object> clockInDataMatchInfo = new HashMap<>();
         String punchDate = Util.null2String(pbData.get("bcrq"));
         String startBeforeDate = DateUtil.beforeDay(punchDate,2);
@@ -251,7 +251,7 @@ public class ShiftServiceImpl extends Service implements ShiftService {
         getClockTimeParam.put("date",punchDate);
         getClockTimeParam.put("clockInTimeList",clockInData);
         getClockTimeParam.put("schedulingResultCollect",schedulingResultsMap);
-//        getClockTimeParam.put("clockInTimeMap",clockInTimeMap);
+        getClockTimeParam.put("clockInTimeMap",clockInTimeMap);
         getClockTimeParam.put("clockInTimeCollect",collect);
         getClockTimeParam.put("userId",empId);
         //打卡数据

src/com/engine/attendance/attendanceanalysis/service/impl/WorkOverTimeServiceImpl.java

@@ -159,9 +159,9 @@ public class WorkOverTimeServiceImpl extends Service implements WorkOverTimeServ
             //核算单位
             String workOverTimeHsdw = Util.null2String(workTimeBeLateItems.get(0).get("hsdw"));
             //晚于开始时间忽略分钟数
-            String jbwdhlfzs = Util.null2String(workTimeBeLateItems.get(0).get("jbwdhlfzs"));
+            String jbwdhlfzs = Util.null2String(workTimeBeLateItems.get(0).get("jbwdhlfzs")).equals("")?"0":Util.null2String(workTimeBeLateItems.get(0).get("jbwdhlfzs"));
             //早于结束时间忽略分钟数
-            String jbzzhlfzs = Util.null2String(workTimeBeLateItems.get(0).get("jbzzhlfzs"));
+            String jbzzhlfzs = Util.null2String(workTimeBeLateItems.get(0).get("jbzzhlfzs")).equals("")?"0":Util.null2String(workTimeBeLateItems.get(0).get("jbzzhlfzs"));
 
             /**
              * 获得实际加班时间

src/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.java

@@ -43,9 +43,9 @@ public class AttendanceanalysisAction {
         try {
             Map<String,Object> paramMap = ParamUtil.request2Map(request);
 //            Map<String,Object> paramMap = Maps.newHashMap();
-//            paramMap.put("startDate","2024-05-02");
+//            paramMap.put("startDate","2024-04-22");
-//            paramMap.put("endDate","2024-05-02");
+//            paramMap.put("endDate","2024-04-24");
-//            paramMap.put("userIds","81");
+//            paramMap.put("userIds","31");
 
 
             String startDate = Util.null2String(paramMap.get("startDate"));
@@ -99,6 +99,8 @@ public class AttendanceanalysisAction {
                     classesParamMap.put("current","1");
                     classesParamMap.put("pageSize",10);
                     classesParamMap.put("recurrence",1);
+                    classesParamMap.put("clockInTimeMap",clockInTimeMap);
+                    classesParamMap.put("clockInData",dataList);
                     classesParamMap.put("attendanceItems",attendanceItems);
                     Map<String,Object> schedulMap = utilService.getSchedulingInFormation(classesParamMap);
 
@@ -150,6 +152,8 @@ public class AttendanceanalysisAction {
                     classesParamMap.put("current","1");
                     classesParamMap.put("pageSize",10);
                     classesParamMap.put("recurrence",1);
+                    classesParamMap.put("clockInTimeMap",clockInTimeMap);
+                    classesParamMap.put("clockInData",dataList);
                     classesParamMap.put("attendanceItems",attendanceItems);
                     Map<String,Object> schedulMap = utilService.getSchedulingInFormation(classesParamMap);
 

src/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.java

@@ -37,7 +37,7 @@ public class AttendanceAnalysisWrapper extends Service {
     /**
      * 考勤分析主逻辑入口
      * @param userId 人员id
-     * @param dataList 打卡日期
+     * @param dataList 打卡数据
      * @param attendanceItems 考勤项目
      */
     public void attendanceAnalysis(String userId, List<Map<String,Object>> dataList,List<Map<String,Object>> attendanceItems,List<Map<String,Object>> workHourItems,Map<String,Map<String,Object>> clockInTimeMap){
@@ -63,7 +63,9 @@ public class AttendanceAnalysisWrapper extends Service {
         classesParamMap.put("current","1");
         classesParamMap.put("pageSize",10);
         classesParamMap.put("recurrence",1);
+        classesParamMap.put("clockInTimeMap",clockInTimeMap);
         classesParamMap.put("attendanceItems",attendanceItems);
+        classesParamMap.put("clockInData",dataList);
         Map<String,Object> schedulMap = utilService.getSchedulingInFormation(classesParamMap);
         Map<String,List<Map<String,Object>>> schedulingResultsMap = (Map<String,List<Map<String,Object>>>)schedulMap.get("schedulingResultsMap");
         /**计算获取前一天和第二天打卡数据*/

src/com/engine/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.java

@@ -458,12 +458,16 @@ public class UpdateAttendanceResultWrapper extends Service {
             rqlx = Utils.getDateType(analysisDate,Util.null2String(workHourItems.get(0).get("qyrl")));
             params.put("workHourItem",workHourItems.get(0));
             if (CommonUtil.ifContainStr(hsgsdrqlx,rqlx,",")){
+                //走综合工时
                 comprehensiveWorkingHourService.excuteByWorkHour(params);
             }else {
                 //没有排班
+                recordParam.put("recordData",recordDataList);
                 utilService.recordItem(recordParam);
             }
         }else {
+            //没有排班
+            recordParam.put("recordData",recordDataList);
             utilService.recordItem(recordParam);
         }
 

test/TestAttendanceAllowance/Test.java

@@ -16,7 +16,7 @@ Test extends beforlog{
         Map<String,Object> paramMap = Maps.newHashMap();
         paramMap.put("startDate","2024-04-15");
         paramMap.put("endDate","2024-04-15");
-        paramMap.put("userIds","81");
+        paramMap.put("userIds","31");
 
         beforlog be = new beforlog();
         AttendanceanalysisAction action = new AttendanceanalysisAction();