Merge remote-tracking branch 'origin/main'

.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Ч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
+蝭鷉雐阩蘥⺄蔴詄鹒蝘鮢雈藂鎋醏衈羅闬蘟鉤豜鑌鵢鮚誦韄羆裗謃誣馷羍鈊鴅鋔蹃
魙<EFBFBD>鍆鎫蟶銅謞聕賩齵鈠鱵髙鱹蝲謢雥觺訶鸤腦轡襑隬關軼齔颷蒢蒚赨頟<EFBFBD>Y餤鶼蒤腣臷軻裌螿鳷萓鋄輀譝蔰興蝍鞽鳻<EFBFBD>Y蟈芓餜萕薟鸘薶謨
輝駓鈝蓋齶髙饅鉿躽纜聓鴝纙髕鎨衱鈛薙頩赲臰黋霿踋靁衉<EFBFBD>Y閇齩鋛閟錺踥謔<EFBFBD>r飗蝦鄋髎飊謕飉髆鈙纑聀觭蝧蛈鉸蝭苪靦鹴蓆蘹謜蛺
藥
蛷
鷳
貜
袕
顜
膸
菒
韻
鯈
翍
顜
陳
鷰
賺
諒
饚
謶
虗
諒
蕫
驆
鲝
迱
鋶
袔
饙
鼛
貜
蕭
藫
翋
顝
陹
鶔
諒
膸
鐞
鼝
鄭
釕
鷱
鶑
輲
鄴
蕩
陯
虓
驉
陸
釓
鈵
袗
饚
鴱
鼛
飴
菗
茟
飹
聨
藨
輴
鈵
顝
訍
蓭
迯
麗
麖
謸
鐝
鎻
雿
鴲
蹛
迵
謴
鰩
趷
鋹
缾
趯
聨
銖
魨
謳
袕
菒
鄲
鞇
訊
顝
陱
髲
茠
該
脨
藨
鶔
蕭
陳
艀
辸<EFBFBD>t蕑駑謝醰貀鷚鵺鴛蕏誼飝齰鰔膗顅関顅閤⺧襩蚼説餵黫踡趂齣胟騤騦鹙駃鄊貇韢鈣脈<EFBFBD>賬<EFBFBD>雫<EFBFBD>~䙌苺
<EFBFBD>鎪鱸<EFBFBD>賫<EFBFBD><EFBFBD>䙡虀舿詞鱺<EFBFBD>閪<EFBFBD>羱<EFBFBD>髜膤<EFBFBD>駝
辀袻翷跮繫釳鏜隡隡頜覰鐼隡頜鏜鐼闙頜鍹鐼馣銴錕闗繩罦肑<EFBFBD>J錕鉑釱螸跭鍷鏚鏚錕镵錕錕镴繨鍶覭錕镵鍷錕鍷銴鏚鏚蠰銴錕跭諮罦鐹銴錕鐺鉑螸鉑銴鉑镵鏚鍷錕繩腏蘒覭釱鉑鐺鏚錕銴鏚錕鏚襆鍷鏚隞<EFBFBD>I覬訩錕鍷鏚銴螸鍷鍷鍷銴闗銴譑跩繨鍶﨣銴銴銴銴

.idea/workspace.xml

@@ -10,21 +10,36 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="baeb3dfb-5097-46c5-933e-6d1dab18b815" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/cmd/DeleteBatchScheduleCmd.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$/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$/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/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/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/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/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/attendance/component/persongroup/service/SchedulingResultsService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/service/SchedulingResultsService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/service/impl/SchedulingResultsServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/service/impl/SchedulingResultsServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/web/SchedulingResultsAction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/web/SchedulingResultsAction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/vacation/cmd/VocationCmd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/vacation/cmd/VocationCmd.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/vacation/service/impl/VocationServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/vacation/service/impl/VocationServiceImpl.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/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/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/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/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/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/component/persongroup/service/impl/PersonGroupServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/service/impl/PersonGroupServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/workflow/service/impl/AskForLeaveServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/workflow/service/impl/AskForLeaveServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/common/util/Utils$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/common/util/Utils$1.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/common/util/Utils$2.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/common/util/Utils$2.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/common/util/Utils$3.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/common/util/Utils$3.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" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -67,7 +82,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$/log/interceptSql" />
+    <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" />
@@ -101,7 +116,7 @@
       <command value="organzationList" />
     </option>
   </component>
-  <component name="RunManager" selected="JUnit.TestSchedulingResultsAction.test1">
+  <component name="RunManager" selected="JUnit.Test.testAnalysis">
     <configuration name="Test" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="Test" />
       <module name="hrm-attendance" />
@@ -141,24 +156,24 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="Test2.testAnalysis" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="TestSchedulingResultsAction.test1" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="hrm-attendance" />
       <shortenClasspath name="MANIFEST" />
       <extension name="coverage">
         <pattern>
-          <option name="PATTERN" value="TestAttendanceAllowance.*" />
+          <option name="PATTERN" value="web.*" />
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
-      <option name="PACKAGE_NAME" value="TestAttendanceAllowance" />
-      <option name="MAIN_CLASS_NAME" value="TestAttendanceAllowance.Test2" />
-      <option name="METHOD_NAME" value="testAnalysis" />
+      <option name="PACKAGE_NAME" value="web" />
+      <option name="MAIN_CLASS_NAME" value="web.TestSchedulingResultsAction" />
+      <option name="METHOD_NAME" value="test1" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="TestSchedulingResultsAction.test1" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="TestSchedulingResultsAction.testquery" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="hrm-attendance" />
       <shortenClasspath name="MANIFEST" />
       <extension name="coverage">
@@ -169,7 +184,7 @@
       </extension>
       <option name="PACKAGE_NAME" value="web" />
       <option name="MAIN_CLASS_NAME" value="web.TestSchedulingResultsAction" />
-      <option name="METHOD_NAME" value="test1" />
+      <option name="METHOD_NAME" value="testquery" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
@@ -201,11 +216,11 @@
     </configuration>
     <recent_temporary>
       <list>
+        <item itemvalue="JUnit.Test.testAnalysis" />
+        <item itemvalue="JUnit.TestSchedulingResultsAction.testquery" />
         <item itemvalue="JUnit.TestSchedulingResultsAction.test1" />
         <item itemvalue="JUnit.Test1.test1" />
-        <item itemvalue="JUnit.Test.testAnalysis" />
         <item itemvalue="Application.Test" />
-        <item itemvalue="JUnit.Test2.testAnalysis" />
       </list>
     </recent_temporary>
   </component>
@@ -707,7 +722,17 @@
       <workItem from="1719812427959" duration="2488000" />
       <workItem from="1719816602545" duration="11043000" />
       <workItem from="1719884256412" duration="1573000" />
-      <workItem from="1719898656034" duration="14418000" />
+      <workItem from="1719898656034" duration="15150000" />
+      <workItem from="1719921990528" duration="2238000" />
+      <workItem from="1719930981047" duration="2159000" />
+      <workItem from="1719970461520" duration="6073000" />
+      <workItem from="1719984929657" duration="11486000" />
+      <workItem from="1720056499151" duration="5500000" />
+      <workItem from="1720071605340" duration="6183000" />
+      <workItem from="1720083750296" duration="7573000" />
+      <workItem from="1720099326817" duration="2000" />
+      <workItem from="1720144120321" duration="6353000" />
+      <workItem from="1720157535171" duration="1191000" />
     </task>
     <servers />
   </component>
@@ -758,38 +783,48 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/com/engine/common/util/DateUtil.java</url>
-          <line>171</line>
+          <line>175</line>
           <option name="timeStamp" value="138" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl.java</url>
-          <line>382</line>
-          <option name="timeStamp" value="170" />
+          <url>file://$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/cmd/DeleteBatchScheduleCmd.java</url>
+          <line>28</line>
+          <option name="timeStamp" value="186" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl.java</url>
-          <line>418</line>
-          <option name="timeStamp" value="171" />
+          <url>file://$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/RecordDataCmd.java</url>
+          <line>100</line>
+          <option name="timeStamp" value="198" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.java</url>
-          <line>414</line>
-          <option name="timeStamp" value="183" />
+          <url>file://$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/ComputeAttendanceDurationCmd.java</url>
+          <line>114</line>
+          <option name="timeStamp" value="199" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.java</url>
-          <line>422</line>
-          <option name="timeStamp" value="184" />
+          <url>file://$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/ComputeAttendanceDurationCmd.java</url>
+          <line>69</line>
+          <option name="timeStamp" value="200" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/MergeApairClockPoint.java</url>
-          <line>27</line>
-          <option name="timeStamp" value="185" />
+          <url>file://$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/GetClockInPointCmd.java</url>
+          <line>330</line>
+          <option name="timeStamp" value="204" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/cmd/DeleteBatchScheduleCmd.java</url>
-          <line>28</line>
-          <option name="timeStamp" value="186" />
+          <url>file://$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/GetClockInPointCmd.java</url>
+          <line>296</line>
+          <option name="timeStamp" value="205" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/GetClockInPointCmd.java</url>
+          <line>912</line>
+          <option name="timeStamp" value="208" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/GetClockInPointCmd.java</url>
+          <line>209</line>
+          <option name="timeStamp" value="209" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -810,7 +845,7 @@
     <SUITE FILE_PATH="coverage/hrm_attendance$TestgetDepartSchedule_test2.ic" NAME="TestgetDepartSchedule.test2 Coverage Results" MODIFIED="1718071420719" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
       <FILTER>calendarscheduling.*</FILTER>
     </SUITE>
-    <SUITE FILE_PATH="coverage/hrm_attendance$Test_testAnalysis.ic" NAME="Test.testAnalysis Coverage Results" MODIFIED="1718334152101" 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="1720084643105" 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/ComputeAttendanceDurationCmd.java

@@ -65,7 +65,7 @@ public class ComputeAttendanceDurationCmd extends AbstractCommonCommand<Map<Stri
          * 当工作时间段存在异常项目时
          */
         //abnormalClockInList = abnormalClockInList.stream().filter(e->e.get("bdlx").equals(ClassSegmentTypeEnum.WORK_TIME.getKey())).collect(Collectors.toList());
-        Map<Object,List<Map<String,Object>>> abnormalClockInGroupMap = abnormalClockInList.stream().filter(e->e.get("bdlx").equals(ClassSegmentTypeEnum.WORK_TIME.getKey()) && e.get("clcokInTimeData") != null)
+        Map<Object,List<Map<String,Object>>> abnormalClockInGroupMap = abnormalClockInList.stream().filter(e->(e.get("bdlx").equals(ClassSegmentTypeEnum.WORK_TIME.getKey()) || e.get("bdlx").equals(ClassSegmentTypeEnum.ASK_FOR_LEAVE.getKey()) || e.get("bdlx").equals(ClassSegmentTypeEnum.EVECTION.getKey())) && e.get("clcokInTimeData") != null)
                 .collect(Collectors.groupingBy(e->Util.null2String(e.get("clcokInTimeData"))));
         List<Map<String,Object>> filterAbnormalList = Lists.newArrayList();
         abnormalClockInGroupMap.entrySet().forEach(e->{
@@ -78,7 +78,7 @@ public class ComputeAttendanceDurationCmd extends AbstractCommonCommand<Map<Stri
                 filterAbnormalList.add(list.get(0));
             }
         });
-        filterAbnormalList.addAll(abnormalClockInList.stream().filter(e->e.get("bdlx").equals(ClassSegmentTypeEnum.WORK_TIME.getKey()) && e.get("clcokInTimeData") == null).collect(Collectors.toList()));
+        filterAbnormalList.addAll(abnormalClockInList.stream().filter(e->(e.get("bdlx").equals(ClassSegmentTypeEnum.WORK_TIME.getKey()) || e.get("bdlx").equals(ClassSegmentTypeEnum.ASK_FOR_LEAVE.getKey()) || e.get("bdlx").equals(ClassSegmentTypeEnum.EVECTION.getKey())) && e.get("clcokInTimeData") == null).collect(Collectors.toList()));
 
         double abnormalTime = 0;
         for (Map<String,Object> abnormalClockInMap : filterAbnormalList){
@@ -184,11 +184,13 @@ public class ComputeAttendanceDurationCmd extends AbstractCommonCommand<Map<Stri
         double employTime = 0;
         double edsc = Double.valueOf(scheduleResult.get(0).get("edsc").toString());
         for (int i=0;i<evectionList.size();i++){
-            //请假时长
+            //出差时长
             String ccsc = Util.null2String(evectionList.get(i).get("ccsc"));
-            //请假项目
+            //出差时长分钟数
+            int ccscMinute = "".equals(ccsc)?0:Double.valueOf(Math.ceil(Double.valueOf(ccsc)*60)).intValue();
+            //出差项目
             Map<String,Object> askForLeaveItem = evectionItems.get(evectionList.get(i).get("cclx"));
-            //半天请假
+            //半天出差
             String btcc = Util.null2String(evectionList.get(i).get("btcc"));
             //作用时段
             String zysd = Util.null2String(askForLeaveItem.get("zysd"));
@@ -212,14 +214,19 @@ public class ComputeAttendanceDurationCmd extends AbstractCommonCommand<Map<Stri
                 }
             }else {
                 //按照开始时间，结束时间请假
+                int time = 0;
                 for (Map<String, Object> scheduleMap:scheduleResult){
                     String dtkssj = Utils.getkssjTime(scheduleMap,analysisDate);
                     String dtjssj = Utils.getjssjTime(scheduleMap,analysisDate);
                     if (ClassSegmentTypeEnum.WORK_TIME.getKey().equals(scheduleMap.get("bdlx"))){
-                        employTime +=Utils.getStartAndEndTime(dtkssj,dtjssj,evectionList.get(i));
+                        time = time + Utils.getStartAndEndTime(dtkssj,dtjssj,evectionList.get(i));
                     }
                 }
+                if (time > ccscMinute){
+                    time = ccscMinute;
+                }
 
+                employTime = employTime+time;
             }
         }
         return employTime;

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

@@ -132,7 +132,7 @@ public class GetEvectionCmd extends AbstractCommonCommand<Map<String,Object>> {
                     put("bcxx", scheduleResult.get(0).get("bcxx"));
                     put("bcsdxx", scheduleResult.get(0).get("bcsdxx"));
                     put("edsc", scheduleResult.get(0).get("edsc"));
-                    put("bdlx", ClassSegmentTypeEnum.ASK_FOR_LEAVE.getKey());
+                    put("bdlx", ClassSegmentTypeEnum.EVECTION.getKey());
                     put("dtkssj",evectionData.get("kssj"));
                     put("dtjssj",evectionData.get("jssj"));
                     put("ksdk",evectionItem.get("lgsbxydk"));

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

@@ -146,7 +146,7 @@ public class GetClockInPointCmd extends AbstractCommonCommand<Map<String, Object
                 String str = lists.get(0);
                 if (ClockPointEnum.START.getKey().equals(str.split("&")[1]) && CheckBoxEnum.CHECKED.getKey().equals(evctionjsdk)){
                     newNeedClockLists.add(str.split("&")[0]+"&"+str.split("&")[1]+"&0");
-                }else if (ClockPointEnum.END.getKey().equals(str.split("-")[1]) && CheckBoxEnum.CHECKED.getKey().equals(evctionksdk)){
+                }else if (ClockPointEnum.END.getKey().equals(str.split("&")[1]) && CheckBoxEnum.CHECKED.getKey().equals(evctionksdk)){
                     newNeedClockLists.add(str.split("&")[0]+"&"+str.split("&")[1]+"&0");
                 }
             }else if (lists.size() > 1){
@@ -237,6 +237,9 @@ public class GetClockInPointCmd extends AbstractCommonCommand<Map<String, Object
             }
         }
 
+        needClockDateList = needClockDateList.stream().sorted(Comparator.comparing(e->DateUtil.getTime(e).toInstant(ZoneOffset.of("+8")).toEpochMilli())).collect(Collectors.toList());
+
+
         this.needClockDateList=needClockDateList;
         log.info("经过重新计算卡点时 新的scheduleResult : [{}]",scheduleResult);
 

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

@@ -44,9 +44,9 @@ public class AttendanceanalysisAction {
         try {
             Map<String,Object> paramMap = ParamUtil.request2Map(request);
 //            Map<String,Object> paramMap = Maps.newHashMap();
-//            paramMap.put("startDate","2024-05-24");
-//            paramMap.put("endDate","2024-05-24");
-//            paramMap.put("userIds","304");
+//            paramMap.put("startDate","2024-07-03");
+//            paramMap.put("endDate","2024-07-03");
+//            paramMap.put("userIds","81");
 
             String startDate = Util.null2String(paramMap.get("startDate"));
             String startBeforeDate = DateUtil.beforeDay(startDate,2);

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

@@ -298,6 +298,7 @@ public class UpdateAttendanceResultWrapper extends Service {
                 }
             }else {
                 //按照开始时间，结束时间请假
+
                 int timeMinutes = DateUtil.getBetWeenMinutes(kssj,jssj);
                 if (CheckBoxEnum.CHECKED.getKey().equals(zdycbcndfgzsd)){
                     timeMinutes = Utils.removeRestTime(kssj,jssj,scheduleResult,analysisDate);
@@ -358,6 +359,8 @@ public class UpdateAttendanceResultWrapper extends Service {
         List<Map<String,Object>> abnormalClockInList = (List<Map<String,Object>>)params.get("abnormalClockInList");
         //外出抵消异常
         List<Map<String,Object>> offsetEvectionAnomaly = Lists.newArrayList();
+        //卡点
+        List<ClockPointDTO> clcokInTimeData = (List<ClockPointDTO>)params.get("clcokInTimeData");
 
         Map<String, Object> map = Maps.newHashMap();
         List<Map<String, Object>> resultList = Lists.newArrayList();
@@ -461,6 +464,8 @@ public class UpdateAttendanceResultWrapper extends Service {
                 }
             }else {
                 //按照开始时间，结束时间出差
+
+
                 int timeMinutes = DateUtil.getBetWeenMinutes(kssj,jssj);
                 if (CheckBoxEnum.CHECKED.getKey().equals(zdycbcndfgzsd)){
                     timeMinutes = Utils.removeRestTime(kssj,jssj,scheduleResult,analysisDate);

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

@@ -388,6 +388,8 @@ public class WorkRulesServiceImpl extends Service implements WorkRulesService {
         List<String> dateList = Arrays.asList(dateArrs.split(","));
         String formmodeid = Utils.getFormmodeIdMap().get("uf_pbjg");
         List<Map<String,Object>> organizationList = Lists.newArrayList();
+        String sql = "select id,sfxx,bcsdxx from uf_jcl_kq_bcxx where id = ?";
+        List<Map<String,Object>> list = DbTools.getSqlToList(sql,bcxxId);
         for (String date : dateList){
             //系统管理员
             List<String> beContainIds = null;
@@ -404,7 +406,8 @@ public class WorkRulesServiceImpl extends Service implements WorkRulesService {
                 map.put("rqlx",CommonUtil.getRqlx(str,date));
                 map.put("pbtj",RegularScheduleTypeEnum.CALENDAR.getKey());
                 map.put("bcrq",date);
-                map.put("sfxx", CommonUtil.ifrestByClass(bcxxId));
+                map.put("sfxx", Util.null2String(list.get(0).get("sfxx")).equals("") ?CheckBoxEnum.UNCHECKED.getValue() : Util.null2String(list.get(0).get("sfxx")));
+                map.put("bcsdxx",list.get(0).get("bcsdxx"));
                 map.put("sfdkpp",CheckBoxEnum.UNCHECKED.getKey());
                 map.put("bcxx",bcxxId);
                 map.put("pbrq",DateUtil.getCurrentDate());

src/com/engine/attendance/component/persongroup/cmd/GetDatatableCmd.java

@@ -33,6 +33,8 @@ public class GetDatatableCmd extends AbstractCommonCommand<Map<String,Object>> {
         int total = Integer.valueOf(Util.null2String(params.get("total")));
         int current = Integer.valueOf(Util.null2String(params.get("current")));
         int pageSize = Integer.valueOf(Util.null2String(params.get("pageSize")));
+        String showAll = Util.null2String(params.get("showAll"));
+
         RecordSet rs = new RecordSet();
         Map<String, Object> resultMap = Maps.newHashMap();
         String sql = "select id from "+tableName +" where 1=1 ";

src/com/engine/attendance/component/persongroup/cmd/GetDatatableCountCmd.java

@@ -27,6 +27,7 @@ public class GetDatatableCountCmd extends AbstractCommonCommand<Map<String,Objec
         String endDate = Util.null2String(params.get("endDate"));
         String pblx = Util.null2String(params.get("pblx"));
         String pbdx = Util.null2String(params.get("pbdx"));
+        String showAll = Util.null2String(params.get("showAll"));
 
 
         String sql = "select count(0) total from "+tableName +" where 1=1";

src/com/engine/attendance/component/persongroup/cmd/GetDatatableRecurrenceCmd.java

@@ -1,6 +1,7 @@
 package com.engine.attendance.component.persongroup.cmd;
 
 import com.engine.attendance.component.persongroup.commonutil.PersongroupCommonUtil;
+import com.engine.attendance.enums.CheckBoxEnum;
 import com.engine.attendance.enums.SchedulingApproachEnum;
 import com.engine.common.biz.AbstractCommonCommand;
 import com.engine.common.entity.BizLogContext;
@@ -41,6 +42,7 @@ public class GetDatatableRecurrenceCmd extends AbstractCommonCommand<Map<String,
         String endDate = Util.null2String(params.get("endDate"));
         String pblx = Util.null2String(params.get("pblx"));
         String pbdx = Util.null2String(params.get("pbdx"));
+        String showAll = Util.null2String(params.get("showAll"));
 
         String sql = "select a.id as keyid,b.lastname,a.* from "+tableName +" a left join hrmresource b on a.pbdxry=b.id where 1=1 ";
 
@@ -116,19 +118,27 @@ public class GetDatatableRecurrenceCmd extends AbstractCommonCommand<Map<String,
 
 
                     //排班途径枚举集合
-                    for (SchedulingApproachEnum schedulingApproachEnum :SchedulingApproachEnum.values()){
-                        List<Map<String,Object>> resulstList = personCollect.get(schedulingApproachEnum.getKey());
-                        if (resulstList == null || resulstList.size() == 0){
-                            resulstList = personGroupCollect.get(schedulingApproachEnum.getKey());
+
+                    if (CheckBoxEnum.CHECKED.getKey().equals(showAll)){
+                        dataTableList.addAll(dataList);
+                        dataTableList.addAll(personGroupList);
+                        dataTableList.addAll(departmentList);
+                        dataTableList.addAll(subCompanyList);
+                    }else {
+                        for (SchedulingApproachEnum schedulingApproachEnum :SchedulingApproachEnum.values()){
+                            List<Map<String,Object>> resulstList = personCollect.get(schedulingApproachEnum.getKey());
                             if (resulstList == null || resulstList.size() == 0){
-                                resulstList = departmentCollect.get(schedulingApproachEnum.getKey());
+                                resulstList = personGroupCollect.get(schedulingApproachEnum.getKey());
                                 if (resulstList == null || resulstList.size() == 0){
-                                    resulstList = subCompanyCollect.get(schedulingApproachEnum.getKey());
+                                    resulstList = departmentCollect.get(schedulingApproachEnum.getKey());
+                                    if (resulstList == null || resulstList.size() == 0){
+                                        resulstList = subCompanyCollect.get(schedulingApproachEnum.getKey());
+                                    }
                                 }
                             }
-                        }
-                        if (resulstList != null && resulstList.size() != 0){
-                            dataTableList.addAll(resulstList);
+                            if (resulstList != null && resulstList.size() != 0){
+                                dataTableList.addAll(resulstList);
+                            }
                         }
                     }
                 }else if ("1".equals(pblx)){
@@ -163,13 +173,18 @@ public class GetDatatableRecurrenceCmd extends AbstractCommonCommand<Map<String,
 
 
                     //排班枚举集合
-                    for (SchedulingApproachEnum schedulingApproachEnum :SchedulingApproachEnum.values()){
-                        List<Map<String,Object>> resulstList = departmentCollect.get(schedulingApproachEnum.getKey());
-                        if (resulstList == null || resulstList.size() == 0){
-                            resulstList = subcompanyCollect.get(schedulingApproachEnum.getKey());
-                        }
-                        if (resulstList != null && resulstList.size() != 0){
-                            dataTableList.addAll(resulstList);
+                    if (CheckBoxEnum.CHECKED.getKey().equals(showAll)){
+                        dataTableList.addAll(departmentList);
+                        dataTableList.addAll(subcompanyList);
+                    }else {
+                        for (SchedulingApproachEnum schedulingApproachEnum :SchedulingApproachEnum.values()){
+                            List<Map<String,Object>> resulstList = departmentCollect.get(schedulingApproachEnum.getKey());
+                            if (resulstList == null || resulstList.size() == 0){
+                                resulstList = subcompanyCollect.get(schedulingApproachEnum.getKey());
+                            }
+                            if (resulstList != null && resulstList.size() != 0){
+                                dataTableList.addAll(resulstList);
+                            }
                         }
                     }
 

src/com/engine/attendance/component/persongroup/commonutil/PersongroupCommonUtil.java

@@ -161,6 +161,7 @@ public class PersongroupCommonUtil {
             String rqlx = Util.null2String(organization.get("rqlx"));
             for (Map<String,Object> insertData : insertDataList){
                 ArrayList<Object> list = new ArrayList<>();
+                list.add(insertData.get("bcbdsj"));
                 list.add(insertData.get("pbtj"));
                 list.add(insertData.get("pbgl"));
                 list.add(organization.get("dxlx"));
@@ -228,7 +229,7 @@ public class PersongroupCommonUtil {
 
         if (addlist.size() >0){
             log.debug("addlist :[{}]",addlist);
-            String insertSql = "insert into uf_pbjg (pbtj,pbgl,dxlx,pbdxry,pbdxryfz,pbdxbm,pbdxfb,bcrq,rqlx,sfxx,sfdkpp,bcxx,hxbz,pbrq,pbsj,formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime,MODEUUID) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+            String insertSql = "insert into uf_pbjg (bcbdsj,pbtj,pbgl,dxlx,pbdxry,pbdxryfz,pbdxbm,pbdxfb,bcrq,rqlx,sfxx,sfdkpp,bcxx,hxbz,pbrq,pbsj,formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime,MODEUUID) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
              result =rs.executeBatchSql(insertSql,addlist);
             log.debug("result :[{}]",result);
         }
@@ -260,6 +261,7 @@ public class PersongroupCommonUtil {
         for (Map<String,Object> organization: organizationList){
             String rqlx = Util.null2String(organization.get("rqlx"));
                 ArrayList<Object> list = new ArrayList<>();
+                list.add(organization.get("bcsdxx"));
                 list.add(organization.get("pbtj"));
                 list.add(organization.get("pbgl"));
                 list.add(organization.get("dxlx"));
@@ -318,7 +320,7 @@ public class PersongroupCommonUtil {
 
         if (addlist.size() >0){
             log.debug("addlist :[{}]",addlist);
-            String insertSql = "insert into uf_pbjg (pbtj,pbgl,dxlx,pbdxry,pbdxryfz,pbdxbm,pbdxfb,bcrq,rqlx,sfxx,sfdkpp,bcxx,hxbz,pbrq,pbsj,formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime,MODEUUID) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+            String insertSql = "insert into uf_pbjg (bcbdsj,pbtj,pbgl,dxlx,pbdxry,pbdxryfz,pbdxbm,pbdxfb,bcrq,rqlx,sfxx,sfdkpp,bcxx,hxbz,pbrq,pbsj,formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime,MODEUUID) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
             result =rs.executeBatchSql(insertSql,addlist);
             log.debug("result :[{}]",result);
         }

src/com/engine/attendance/component/persongroup/job/scheduling/tactics/DayRegularScheduling.java

@@ -62,8 +62,11 @@ public class DayRegularScheduling implements RegularScheduling{
 
 
         //规律排班明细表数据
-        String sql = "select a.ksts,a.jsts,a.hxbz,a.bcmc,b.sfxx from uf_jcl_kq_glpb_dt1 a left join uf_jcl_kq_bcxx b on a.bcmc=b.id where a.mainid=?";
+        String sql = "select a.ksts,a.jsts,a.hxbz,a.bcmc,b.sfxx,b.bcsdxx from uf_jcl_kq_glpb_dt1 a left join uf_jcl_kq_bcxx b on a.bcmc=b.id where a.mainid=?";
         List<Map<String,Object>> detailDataList = DbTools.getSqlToList(sql,id);
+        if (detailDataList.size() == 0){
+            return;
+        }
         //规律排班适用组织数据
         sql = "select dx,dxlx,aqjb from uf_jcl_syzz where modeid=? and dataid=?";
         List<Map<String,Object>> organizationList = DbTools.getSqlToList(sql,modeId,id);
@@ -99,6 +102,7 @@ public class DayRegularScheduling implements RegularScheduling{
                 dataMap.put("pbtj", SchedulingApproachEnum.RULE.getKey());
                 dataMap.put("pbgl",id);
                 dataMap.put("bcrq",bcrq);
+
                 if (jsts >= leaveDay && ksts <=leaveDay){
                     String dateTime =bcrq;
                     log.debug("dateTime :{},count: {},map : {}",dateTime,count,map);
@@ -121,11 +125,13 @@ public class DayRegularScheduling implements RegularScheduling{
                         dataMap.put("sfdkpp","0");
                         dataMap.put("hxbz",null);
                         dataMap.put("bcxx",map.get("bcmc"));
+                        dataMap.put("bcbdsj",map.get("bcsdxx"));
                     }else if ("1".equals(pbfs)){
                         //打卡匹配
                         dataMap.put("sfdkpp","1");
                         dataMap.put("hxbz",map.get("hxbz"));
                         dataMap.put("bcxx",null);
+                        dataMap.put("bcbdsj",null);
                     }
                     dataMap.put("pbrq",DateUtil.getCurrentDate());
                     dataMap.put("pbsj",DateUtil.getCurrentTime("yyyy-MM-dd HH:mm").split(" ")[1]);

src/com/engine/attendance/component/persongroup/job/scheduling/tactics/MonthRegularScheduling.java

@@ -63,8 +63,11 @@ public class MonthRegularScheduling implements RegularScheduling{
 
 
         //规律排班明细表数据
-        String sql = "select a.ksr,a.jsr,a.hxbz,a.bcmc,b.sfxx from uf_jcl_kq_glpb_dt1 a left join uf_jcl_kq_bcxx b on a.bcmc=b.id where a.mainid=?";
+        String sql = "select a.ksr,a.jsr,a.hxbz,a.bcmc,b.sfxx,b.bcsdxx from uf_jcl_kq_glpb_dt1 a left join uf_jcl_kq_bcxx b on a.bcmc=b.id where a.mainid=?";
         List<Map<String,Object>> detailDataList = DbTools.getSqlToList(sql,id);
+        if (detailDataList.size() == 0){
+            return;
+        }
         //规律排班适用组织数据
         sql = "select dx,dxlx,aqjb from uf_jcl_syzz where modeid=? and dataid=?";
         List<Map<String,Object>> organizationList = DbTools.getSqlToList(sql,modeId,id);
@@ -115,11 +118,13 @@ public class MonthRegularScheduling implements RegularScheduling{
                         dataMap.put("sfdkpp","0");
                         dataMap.put("hxbz",null);
                         dataMap.put("bcxx",map.get("bcmc"));
+                        dataMap.put("bcbdsj",map.get("bcsdxx"));
                     }else if ("1".equals(pbfs)){
                         //打卡匹配
                         dataMap.put("sfdkpp","1");
                         dataMap.put("hxbz",map.get("hxbz"));
                         dataMap.put("bcxx",null);
+                        dataMap.put("bcbdsj",null);
                     }
                     dataMap.put("pbrq",DateUtil.getCurrentDate());
                     dataMap.put("pbsj",DateUtil.getCurrentTime("yyyy-MM-dd HH:mm").split(" ")[1]);

src/com/engine/attendance/component/persongroup/job/scheduling/tactics/WeekRegularScheduling.java

@@ -63,8 +63,11 @@ public class WeekRegularScheduling implements RegularScheduling{
 
 
         //规律排班明细表数据
-        String sql = "select a.ksxq,a.jsxq,a.hxbz,a.bcmc,b.sfxx from uf_jcl_kq_glpb_dt1 a left join uf_jcl_kq_bcxx b on a.bcmc=b.id where a.mainid=?";
+        String sql = "select a.ksxq,a.jsxq,a.hxbz,a.bcmc,b.sfxx,b.bcsdxx from uf_jcl_kq_glpb_dt1 a left join uf_jcl_kq_bcxx b on a.bcmc=b.id where a.mainid=?";
         List<Map<String,Object>> detailDataList = DbTools.getSqlToList(sql,id);
+        if (detailDataList.size() == 0){
+            return;
+        }
         //规律排班适用组织数据
         sql = "select dx,dxlx,aqjb from uf_jcl_syzz where modeid=? and dataid=?";
         List<Map<String,Object>> organizationList = DbTools.getSqlToList(sql,modeId,id);
@@ -119,11 +122,13 @@ public class WeekRegularScheduling implements RegularScheduling{
                         dataMap.put("sfdkpp","0");
                         dataMap.put("hxbz",null);
                         dataMap.put("bcxx",map.get("bcmc"));
+                        dataMap.put("bcbdsj",map.get("bcsdxx"));
                     }else if ("1".equals(pbfs)){
                         //打卡匹配
                         dataMap.put("sfdkpp","1");
                         dataMap.put("hxbz",map.get("hxbz"));
                         dataMap.put("bcxx",null);
+                        dataMap.put("bcbdsj",null);
                     }
                     dataMap.put("pbrq",DateUtil.getCurrentDate());
                     dataMap.put("pbsj",DateUtil.getCurrentTime("yyyy-MM-dd HH:mm").split(" ")[1]);

src/com/engine/attendance/component/persongroup/job/scheduling/tactics/YearRegularScheduling.java

@@ -63,8 +63,11 @@ public class YearRegularScheduling implements RegularScheduling{
 
 
         //规律排班明细表数据
-        String sql = "select a.ksrq,a.jsrq,a.hxbz,a.bcmc,b.sfxx from uf_jcl_kq_glpb_dt1 a left join uf_jcl_kq_bcxx b on a.bcmc=b.id where a.mainid=?";
+        String sql = "select a.ksrq,a.jsrq,a.hxbz,a.bcmc,b.sfxx,b.bcsdxx from uf_jcl_kq_glpb_dt1 a left join uf_jcl_kq_bcxx b on a.bcmc=b.id where a.mainid=?";
         List<Map<String,Object>> detailDataList = DbTools.getSqlToList(sql,id);
+        if (detailDataList.size() == 0){
+            return;
+        }
         //规律排班适用组织数据
         sql = "select dx,dxlx,aqjb from uf_jcl_syzz where modeid=? and dataid=?";
         List<Map<String,Object>> organizationList = DbTools.getSqlToList(sql,modeId,id);
@@ -123,11 +126,13 @@ public class YearRegularScheduling implements RegularScheduling{
                         dataMap.put("sfdkpp","0");
                         dataMap.put("hxbz",null);
                         dataMap.put("bcxx",map.get("bcmc"));
+                        dataMap.put("bcbdsj",map.get("bcsdxx"));
                     }else if ("1".equals(pbfs)){
                         //打卡匹配
                         dataMap.put("sfdkpp","1");
                         dataMap.put("hxbz",map.get("hxbz"));
                         dataMap.put("bcxx",null);
+                        dataMap.put("bcbdsj",null);
                     }
                     dataMap.put("pbrq",DateUtil.getCurrentDate());
                     dataMap.put("pbsj",DateUtil.getCurrentTime("yyyy-MM-dd HH:mm").split(" ")[1]);

src/com/engine/attendance/component/persongroup/service/impl/PersonGroupServiceImpl.java

@@ -5,6 +5,7 @@ import com.engine.attendance.component.persongroup.service.PersonGroupService;
 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.conn.RecordSet;
@@ -61,7 +62,8 @@ public class PersonGroupServiceImpl extends Service implements PersonGroupServic
         }
         log.debug("browserTypeMaps : [{}]",browserTypeMaps);
 
-        log.info("PersonGroupServiceImpl dataList : [{}]",dataList);
+
+        List<Map<String,Object>> needRemoveList = Lists.newArrayList();
         for (Map<String,Object> map :dataList){
             Integer fieldlable = Integer.valueOf(map.get("fieldlable").toString());
             String fieldname = Util.null2String(map.get("fieldname"));
@@ -72,7 +74,14 @@ public class PersonGroupServiceImpl extends Service implements PersonGroupServic
             if (fieldname.contains("field")){
                 map.put("selectItems",custSelectItemMap.get(map.get("fieldid").toString()));
             }
+            if (fieldname.equals("jobactivity") || fieldname.equals("jobGroupId")){
+                needRemoveList.add(map);
+            }
         }
+        for (Map<String,Object> map :needRemoveList){
+            dataList.remove(map);
+        }
+        log.info("PersonGroupServiceImpl dataList : [{}]",dataList);
 
         data.put("data",dataList);
 

src/com/engine/attendance/component/persongroup/service/impl/SchedulingResultsServiceImpl.java

@@ -36,6 +36,7 @@ public class SchedulingResultsServiceImpl extends Service implements SchedulingR
         Map<String,Object> resultMap = Maps.newHashMap();
         int current = Integer.valueOf(Util.null2String(params.get("current")));
         int pageSize = Integer.valueOf(Util.null2String(params.get("pageSize")));
+        String showAll = Util.null2String(params.get("showAll"));
         int startindex = (current-1)*pageSize;
         int endindex = current*pageSize;
 //        Map<String,Object> personGroupMap = CommonUtil.getPersonGroup();
@@ -48,6 +49,10 @@ public class SchedulingResultsServiceImpl extends Service implements SchedulingR
             //递归查询方式
             Map<String,Object> result = commandExecutor.execute(new GetDatatableRecurrenceCmd(params));
             List<Map<String, Object>> dataTableList = (List<Map<String, Object>>)result.get("dataTableList");
+            if (!CheckBoxEnum.CHECKED.getKey().equals(showAll)){
+                dataTableList = Utils.getSchedulingList(dataTableList);
+            }
+
             int total = dataTableList.size();
             resultMap.put("total",total);
             if (pageSize != 9999){

src/com/engine/common/util/Utils.java

@@ -1,5 +1,6 @@
 package com.engine.common.util;
 
+import com.engine.attendance.attendanceanalysis.dto.clockpoint.ClockPointDTO;
 import com.engine.attendance.enums.*;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -933,6 +934,11 @@ public class Utils<T> {
     public static double convertDouble(Object num){
         return Util.null2String(num).equals("")?0:Double.valueOf(Util.null2String(num));
     }
+    public static ClockPointDTO getClockPointDTO(List<ClockPointDTO> clockPointDTOList,ClockPointEnum pointType,String time){
+
+
+        return null;
+    }
 
 
 }

test/TestAttendanceAllowance/Test.java

@@ -27,8 +27,8 @@ Test extends beforlog{
     @org.junit.Test
     public void testAnalysis() throws Exception{
         Map<String,Object> paramMap = Maps.newHashMap();
-        paramMap.put("startDate","2024-04-15");
-        paramMap.put("endDate","2024-04-15");
+        paramMap.put("startDate","2024-07-03");
+        paramMap.put("endDate","2024-07-03");
         paramMap.put("userIds","31");
 
         beforlog be = new beforlog();

test/web/TestSchedulingResultsAction.java

@@ -26,4 +26,25 @@ public class TestSchedulingResultsAction extends beforlog {
 
         basicsetService.deleteBatchSchedule(params);
     }
+
+    @Test
+    public  void testquery() {
+        SchedulingResultsService basicsetService = ServiceUtil.getService(SchedulingResultsServiceImpl.class);
+        Map<String,Object> params = Maps.newHashMap();
+//        params.put("ids","182857,182858,182859,182860");
+//        params.put("type","0");
+
+        params.put("tableName","uf_pbjg");
+        params.put("startDate","2024-07-01");
+        params.put("endDate","2024-07-01");
+        params.put("pblx","0");
+        params.put("pbdx","31");
+        params.put("current","1");
+        params.put("pageSize","10");
+        params.put("recurrence","1");
+
+
+
+        basicsetService.queryDataTable(params);
+    }
 }