Merge remote-tracking branch 'origin/main'

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

@@ -1 +1 @@
-蝭鷉雐阩蘥⺄蔴詄鹒蝘鮢雈藂鎋醏衈羅闬蘟鉤豜鑌鵢鮚誦韄羆裗謃誣馷羍鈊鴅鋔蹃
魙<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覬訩錕鍷鏚銴螸鍷鍷鍷銴闗銴譑跩繨鍶﨣銴銴銴銴
+а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,46 +10,19 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="baeb3dfb-5097-46c5-933e-6d1dab18b815" name="Changes" comment="">
+      <change afterPath="$PROJECT_DIR$/src/com/engine/attendance/workflow/action/test/TestRunnable.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/sqllog/ecologysql" beforeDir="false" afterPath="$PROJECT_DIR$/WEB-INF/sqllog/ecologysql" 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/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/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/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/getclockInpoint/MergeApairClockPoint.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/MergeApairClockPoint.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/impl/AskForLeaveServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/impl/AskForLeaveServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/impl/EvectionServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/impl/EvectionServiceImpl.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/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/attendance/enums/ClockPointEnum.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/enums/ClockPointEnum.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$/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/job/scheduling/tactics/DayRegularScheduling.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/job/scheduling/tactics/DayRegularScheduling.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/job/scheduling/tactics/MonthRegularScheduling.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/job/scheduling/tactics/MonthRegularScheduling.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/job/scheduling/tactics/WeekRegularScheduling.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/job/scheduling/tactics/WeekRegularScheduling.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/job/scheduling/tactics/YearRegularScheduling.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/job/scheduling/tactics/YearRegularScheduling.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/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/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/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/GetScheduleResultListCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/cmd/GetScheduleResultListCmd.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/MergeApairClockPoint.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/MergeApairClockPoint.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/EvectionServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/service/impl/EvectionServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/service/impl/ShiftServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/service/impl/ShiftServiceImpl.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/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/enums/ClockPointEnum.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/enums/ClockPointEnum.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/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/Test.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/Test.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/Test.java" beforeDir="false" afterPath="$PROJECT_DIR$/test/Test.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -92,7 +65,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$/../../上海考勤产品/考勤分支代码" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_package_manager_path" value="npm" />
     <property name="project.structure.last.edited" value="Artifacts" />
     <property name="project.structure.proportion" value="0.15" />
@@ -714,7 +687,14 @@
       <workItem from="1719452066813" duration="7179000" />
       <workItem from="1719467422078" duration="18814000" />
       <workItem from="1719540209233" duration="6565000" />
-      <workItem from="1719552784074" duration="3553000" />
+      <workItem from="1719552784074" duration="10907000" />
+      <workItem from="1719639470676" duration="6100000" />
+      <workItem from="1719647614373" duration="8409000" />
+      <workItem from="1719662554646" duration="825000" />
+      <workItem from="1719757945342" duration="1933000" />
+      <workItem from="1719797909327" duration="5196000" />
+      <workItem from="1719812427959" duration="2488000" />
+      <workItem from="1719816602545" duration="2526000" />
     </task>
     <servers />
   </component>
@@ -780,7 +760,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/commonutil/PersongroupCommonUtil.java</url>
-          <line>260</line>
+          <line>268</line>
           <option name="timeStamp" value="172" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
@@ -793,6 +773,11 @@
           <line>422</line>
           <option name="timeStamp" value="184" />
         </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" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
     <watches-manager>

WEB-INF/prop/weaver.properties

@@ -1,23 +1,8 @@
-#DriverClasses=oracle.jdbc.OracleDriver
-#
-#ecology.url = jdbc:oracle:thin:@192.168.0.106:1521:ecology
-#ecology.user = hrm_test
-#ecology.password = ecology
-#ecology.charset = ISO
-#ecology.maxconn = 300
-#ecology.minconn = 50
-#ecology.maxusecount = 6000
-#ecology.maxidletime = 600
-#ecology.maxalivetime = 10
-#ecology.checktime = 3600
-
-
-
-DriverClasses = com.mysql.cj.jdbc.Driver
+DriverClasses=oracle.jdbc.OracleDriver
 
-ecology.url = jdbc:mysql://221.226.25.34:8286/ecologyjcl?characterEncoding=utf8&useSSL=false&autoReconnect=true&failOverReadOnly=false&serverTimezone=Asia/Shanghai
-ecology.user = fanwei
-ecology.password = alpwsl92
+ecology.url = jdbc:oracle:thin:@192.168.0.106:1521:ecology
+ecology.user = hrm_test
+ecology.password = ecology
 ecology.charset = ISO
 ecology.maxconn = 300
 ecology.minconn = 50
@@ -26,6 +11,21 @@ ecology.maxidletime = 600
 ecology.maxalivetime = 10
 ecology.checktime = 3600
 
-ecology.isgoveproj = 0
-LOG_FORMAT = yyyy.MM.dd'-'hh:mm:ss
-DEBUG_MODE = false
+
+
+#DriverClasses = com.mysql.cj.jdbc.Driver
+#
+#ecology.url = jdbc:mysql://221.226.25.34:8286/ecologyjcl?characterEncoding=utf8&useSSL=false&autoReconnect=true&failOverReadOnly=false&serverTimezone=Asia/Shanghai
+#ecology.user = fanwei
+#ecology.password = alpwsl92
+#ecology.charset = ISO
+#ecology.maxconn = 300
+#ecology.minconn = 50
+#ecology.maxusecount = 6000
+#ecology.maxidletime = 600
+#ecology.maxalivetime = 10
+#ecology.checktime = 3600
+#
+#ecology.isgoveproj = 0
+#LOG_FORMAT = yyyy.MM.dd'-'hh:mm:ss
+#DEBUG_MODE = false

WEB-INF/sqllog/ecologysql

@@ -6738,3 +6738,240 @@
 	at com.intellij.rt.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:235)
 	at com.intellij.rt.junit.JUnitStarter.main(JUnitStarter.java:54)
 "
+"2024-06-28","16:48:09.267","loginID=null main-1","67""1-782689036","null","null","update","update uf_jcl_kq_cqjg set cqsc=0.0,cqzt=1,fxrq='2024-06-28 16:48:09',rqlx=0,sfxx=0,bc=33,bcbdxx='09:00-18:00',xm1=142,sc1=3.0,xm2=7,sc2=1,xm3=7,sc3=1,xm4=7,sc4=1,xm5=7,sc5=1,xm6=NULL,sc6=NULL,xm7=NULL,sc7=NULL,xm8=NULL,sc8=NULL,j1=NULL,j2=NULL,j3=NULL,j4=NULL,j5=NULL,j6=NULL,j7=NULL,c1=NULL,j8=NULL,c2=NULL,c3=NULL,c4=NULL,c5=NULL,c6=NULL,c7=NULL,c8=NULL where ygid=? and rq=?,[304, 2024-05-24]",")
+	at weaver.conn.RecordSet.executeSql(RecordSet.java:1372)
+	at weaver.conn.RecordSet.executeUpdate(RecordSet.java:988)
+	at com.engine.common.util.DbTools.update(DbTools.java:120)
+	at com.engine.attendance.attendanceanalysis.cmd.RecordDataCmd.execute(RecordDataCmd.java:103)
+	at com.engine.attendance.attendanceanalysis.cmd.RecordDataCmd.execute(RecordDataCmd.java:22)
+	at com.engine.core.interceptor.CommandInvoker.execute(CommandInvoker.java:38)
+	at com.engine.core.interceptor.CommandContextInterceptor.execute(CommandContextInterceptor.java:42)
+	at com.engine.core.interceptor.LogInterceptor.execute(LogInterceptor.java:19)
+	at com.engine.core.cfg.CommandExecutorImpl.execute(CommandExecutorImpl.java:37)
+	at com.engine.core.cfg.CommandExecutorImpl.execute(CommandExecutorImpl.java:42)
+	at com.engine.attendance.attendanceanalysis.service.impl.UtilServiceImpl.recordItem(UtilServiceImpl.java:61)
+	at com.engine.attendance.attendanceanalysis.wrapper.AttendanceAnalysisWrapper.analysis(AttendanceAnalysisWrapper.java:361)
+	at com.engine.attendance.attendanceanalysis.wrapper.AttendanceAnalysisWrapper.attendanceAnalysisForApi(AttendanceAnalysisWrapper.java:138)
+	at com.engine.attendance.attendanceanalysis.web.AttendanceanalysisAction.getSchedulingData(AttendanceanalysisAction.java:184)
+	at TestAttendanceAllowance.Test.testAnalysis(Test.java:36)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:497)
+	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
+	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
+	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
+	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
+	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
+	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
+	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57)
+	at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
+	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
+	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)
+	at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)
+	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)
+	at org.junit.runners.ParentRunner.run(ParentRunner.java:363)
+	at org.junit.runner.JUnitCore.run(JUnitCore.java:137)
+	at com.intellij.junit4.JUnit4IdeaTestRunner.startRunnerWithArgs(JUnit4IdeaTestRunner.java:69)
+	at com.intellij.rt.junit.IdeaTestRunner$Repeater.startRunnerWithArgs(IdeaTestRunner.java:33)
+	at com.intellij.rt.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:235)
+	at com.intellij.rt.junit.JUnitStarter.main(JUnitStarter.java:54)
+"
+"2024-06-28","16:48:09.822","loginID=null main-1","61""1-782689036","null","null","delete","delete from uf_jcl_kq_jbjg where lyid=?,[60650]",")
+	at weaver.conn.RecordSetTrans.executeSql(RecordSetTrans.java:736)
+	at weaver.conn.RecordSetTrans.executeUpdate(RecordSetTrans.java:430)
+	at com.engine.attendance.attendanceanalysis.cmd.RecordDataCmd.updateWorkOverTimeDate(RecordDataCmd.java:179)
+	at com.engine.attendance.attendanceanalysis.cmd.RecordDataCmd.execute(RecordDataCmd.java:166)
+	at com.engine.attendance.attendanceanalysis.cmd.RecordDataCmd.execute(RecordDataCmd.java:22)
+	at com.engine.core.interceptor.CommandInvoker.execute(CommandInvoker.java:38)
+	at com.engine.core.interceptor.CommandContextInterceptor.execute(CommandContextInterceptor.java:42)
+	at com.engine.core.interceptor.LogInterceptor.execute(LogInterceptor.java:19)
+	at com.engine.core.cfg.CommandExecutorImpl.execute(CommandExecutorImpl.java:37)
+	at com.engine.core.cfg.CommandExecutorImpl.execute(CommandExecutorImpl.java:42)
+	at com.engine.attendance.attendanceanalysis.service.impl.UtilServiceImpl.recordItem(UtilServiceImpl.java:61)
+	at com.engine.attendance.attendanceanalysis.wrapper.AttendanceAnalysisWrapper.analysis(AttendanceAnalysisWrapper.java:361)
+	at com.engine.attendance.attendanceanalysis.wrapper.AttendanceAnalysisWrapper.attendanceAnalysisForApi(AttendanceAnalysisWrapper.java:138)
+	at com.engine.attendance.attendanceanalysis.web.AttendanceanalysisAction.getSchedulingData(AttendanceanalysisAction.java:184)
+	at TestAttendanceAllowance.Test.testAnalysis(Test.java:36)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:497)
+	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
+	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
+	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
+	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
+	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
+	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
+	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57)
+	at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
+	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
+	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)
+	at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)
+	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)
+	at org.junit.runners.ParentRunner.run(ParentRunner.java:363)
+	at org.junit.runner.JUnitCore.run(JUnitCore.java:137)
+	at com.intellij.junit4.JUnit4IdeaTestRunner.startRunnerWithArgs(JUnit4IdeaTestRunner.java:69)
+	at com.intellij.rt.junit.IdeaTestRunner$Repeater.startRunnerWithArgs(IdeaTestRunner.java:33)
+	at com.intellij.rt.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:235)
+	at com.intellij.rt.junit.JUnitStarter.main(JUnitStarter.java:54)
+"
+"2024-06-28","16:48:09.883","loginID=null main-1","70""1-782689036","null","null","delete","delete from uf_jcl_kq_jqye where lyid=?,[60650]",")
+	at weaver.conn.RecordSetTrans.executeSql(RecordSetTrans.java:736)
+	at weaver.conn.RecordSetTrans.executeUpdate(RecordSetTrans.java:430)
+	at com.engine.attendance.attendanceanalysis.cmd.RecordDataCmd.updateWorkOverTimeDate(RecordDataCmd.java:181)
+	at com.engine.attendance.attendanceanalysis.cmd.RecordDataCmd.execute(RecordDataCmd.java:166)
+	at com.engine.attendance.attendanceanalysis.cmd.RecordDataCmd.execute(RecordDataCmd.java:22)
+	at com.engine.core.interceptor.CommandInvoker.execute(CommandInvoker.java:38)
+	at com.engine.core.interceptor.CommandContextInterceptor.execute(CommandContextInterceptor.java:42)
+	at com.engine.core.interceptor.LogInterceptor.execute(LogInterceptor.java:19)
+	at com.engine.core.cfg.CommandExecutorImpl.execute(CommandExecutorImpl.java:37)
+	at com.engine.core.cfg.CommandExecutorImpl.execute(CommandExecutorImpl.java:42)
+	at com.engine.attendance.attendanceanalysis.service.impl.UtilServiceImpl.recordItem(UtilServiceImpl.java:61)
+	at com.engine.attendance.attendanceanalysis.wrapper.AttendanceAnalysisWrapper.analysis(AttendanceAnalysisWrapper.java:361)
+	at com.engine.attendance.attendanceanalysis.wrapper.AttendanceAnalysisWrapper.attendanceAnalysisForApi(AttendanceAnalysisWrapper.java:138)
+	at com.engine.attendance.attendanceanalysis.web.AttendanceanalysisAction.getSchedulingData(AttendanceanalysisAction.java:184)
+	at TestAttendanceAllowance.Test.testAnalysis(Test.java:36)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:497)
+	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
+	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
+	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
+	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
+	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
+	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
+	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57)
+	at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
+	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
+	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)
+	at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)
+	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)
+	at org.junit.runners.ParentRunner.run(ParentRunner.java:363)
+	at org.junit.runner.JUnitCore.run(JUnitCore.java:137)
+	at com.intellij.junit4.JUnit4IdeaTestRunner.startRunnerWithArgs(JUnit4IdeaTestRunner.java:69)
+	at com.intellij.rt.junit.IdeaTestRunner$Repeater.startRunnerWithArgs(IdeaTestRunner.java:33)
+	at com.intellij.rt.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:235)
+	at com.intellij.rt.junit.JUnitStarter.main(JUnitStarter.java:54)
+"
+"2024-06-28","16:48:09.954","loginID=null main-1","67""1-782689036","null","null","update","update uf_jcl_kq_jbjg set lyid =? where lyid=?,[60650, 304-2024-06-28]",")
+	at weaver.conn.RecordSetTrans.executeSql(RecordSetTrans.java:736)
+	at weaver.conn.RecordSetTrans.executeUpdate(RecordSetTrans.java:430)
+	at com.engine.attendance.attendanceanalysis.cmd.RecordDataCmd.updateWorkOverTimeDate(RecordDataCmd.java:183)
+	at com.engine.attendance.attendanceanalysis.cmd.RecordDataCmd.execute(RecordDataCmd.java:166)
+	at com.engine.attendance.attendanceanalysis.cmd.RecordDataCmd.execute(RecordDataCmd.java:22)
+	at com.engine.core.interceptor.CommandInvoker.execute(CommandInvoker.java:38)
+	at com.engine.core.interceptor.CommandContextInterceptor.execute(CommandContextInterceptor.java:42)
+	at com.engine.core.interceptor.LogInterceptor.execute(LogInterceptor.java:19)
+	at com.engine.core.cfg.CommandExecutorImpl.execute(CommandExecutorImpl.java:37)
+	at com.engine.core.cfg.CommandExecutorImpl.execute(CommandExecutorImpl.java:42)
+	at com.engine.attendance.attendanceanalysis.service.impl.UtilServiceImpl.recordItem(UtilServiceImpl.java:61)
+	at com.engine.attendance.attendanceanalysis.wrapper.AttendanceAnalysisWrapper.analysis(AttendanceAnalysisWrapper.java:361)
+	at com.engine.attendance.attendanceanalysis.wrapper.AttendanceAnalysisWrapper.attendanceAnalysisForApi(AttendanceAnalysisWrapper.java:138)
+	at com.engine.attendance.attendanceanalysis.web.AttendanceanalysisAction.getSchedulingData(AttendanceanalysisAction.java:184)
+	at TestAttendanceAllowance.Test.testAnalysis(Test.java:36)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:497)
+	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
+	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
+	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
+	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
+	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
+	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
+	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57)
+	at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
+	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
+	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)
+	at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)
+	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)
+	at org.junit.runners.ParentRunner.run(ParentRunner.java:363)
+	at org.junit.runner.JUnitCore.run(JUnitCore.java:137)
+	at com.intellij.junit4.JUnit4IdeaTestRunner.startRunnerWithArgs(JUnit4IdeaTestRunner.java:69)
+	at com.intellij.rt.junit.IdeaTestRunner$Repeater.startRunnerWithArgs(IdeaTestRunner.java:33)
+	at com.intellij.rt.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:235)
+	at com.intellij.rt.junit.JUnitStarter.main(JUnitStarter.java:54)
+"
+"2024-06-28","16:48:10.021","loginID=null main-1","58""1-782689036","null","null","update","update uf_jcl_kq_jqye set lyid =? where lyid=?,[60650, 304-2024-06-28]",")
+	at weaver.conn.RecordSetTrans.executeSql(RecordSetTrans.java:736)
+	at weaver.conn.RecordSetTrans.executeUpdate(RecordSetTrans.java:430)
+	at com.engine.attendance.attendanceanalysis.cmd.RecordDataCmd.updateWorkOverTimeDate(RecordDataCmd.java:185)
+	at com.engine.attendance.attendanceanalysis.cmd.RecordDataCmd.execute(RecordDataCmd.java:166)
+	at com.engine.attendance.attendanceanalysis.cmd.RecordDataCmd.execute(RecordDataCmd.java:22)
+	at com.engine.core.interceptor.CommandInvoker.execute(CommandInvoker.java:38)
+	at com.engine.core.interceptor.CommandContextInterceptor.execute(CommandContextInterceptor.java:42)
+	at com.engine.core.interceptor.LogInterceptor.execute(LogInterceptor.java:19)
+	at com.engine.core.cfg.CommandExecutorImpl.execute(CommandExecutorImpl.java:37)
+	at com.engine.core.cfg.CommandExecutorImpl.execute(CommandExecutorImpl.java:42)
+	at com.engine.attendance.attendanceanalysis.service.impl.UtilServiceImpl.recordItem(UtilServiceImpl.java:61)
+	at com.engine.attendance.attendanceanalysis.wrapper.AttendanceAnalysisWrapper.analysis(AttendanceAnalysisWrapper.java:361)
+	at com.engine.attendance.attendanceanalysis.wrapper.AttendanceAnalysisWrapper.attendanceAnalysisForApi(AttendanceAnalysisWrapper.java:138)
+	at com.engine.attendance.attendanceanalysis.web.AttendanceanalysisAction.getSchedulingData(AttendanceanalysisAction.java:184)
+	at TestAttendanceAllowance.Test.testAnalysis(Test.java:36)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:497)
+	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
+	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
+	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
+	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
+	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
+	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
+	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57)
+	at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
+	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
+	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)
+	at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)
+	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)
+	at org.junit.runners.ParentRunner.run(ParentRunner.java:363)
+	at org.junit.runner.JUnitCore.run(JUnitCore.java:137)
+	at com.intellij.junit4.JUnit4IdeaTestRunner.startRunnerWithArgs(JUnit4IdeaTestRunner.java:69)
+	at com.intellij.rt.junit.IdeaTestRunner$Repeater.startRunnerWithArgs(IdeaTestRunner.java:33)
+	at com.intellij.rt.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:235)
+	at com.intellij.rt.junit.JUnitStarter.main(JUnitStarter.java:54)
+"
+"2024-06-28","16:48:18.505","loginID=null main-1","59""1-782689036","null","null","delete","delete from uf_jcl_kq_cqjt where rq >= '2024-05-24' and rq <= '2024-05-24' and yg in (304) and bc in (71,55,34,33,31,91),[]",")
+	at weaver.conn.RecordSet.executeSql(RecordSet.java:1372)
+	at weaver.conn.RecordSet.executeUpdate(RecordSet.java:988)
+	at com.engine.common.util.DbTools.update(DbTools.java:117)
+	at com.engine.attendance.workflow.service.impl.AllowanceServiceImpl.addAllowanceRecords(AllowanceServiceImpl.java:160)
+	at com.engine.attendance.attendanceanalysis.web.AttendanceanalysisAction.getSchedulingData(AttendanceanalysisAction.java:188)
+	at TestAttendanceAllowance.Test.testAnalysis(Test.java:36)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:497)
+	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
+	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
+	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
+	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
+	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
+	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
+	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57)
+	at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
+	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
+	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)
+	at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)
+	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)
+	at org.junit.runners.ParentRunner.run(ParentRunner.java:363)
+	at org.junit.runner.JUnitCore.run(JUnitCore.java:137)
+	at com.intellij.junit4.JUnit4IdeaTestRunner.startRunnerWithArgs(JUnit4IdeaTestRunner.java:69)
+	at com.intellij.rt.junit.IdeaTestRunner$Repeater.startRunnerWithArgs(IdeaTestRunner.java:33)
+	at com.intellij.rt.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:235)
+	at com.intellij.rt.junit.JUnitStarter.main(JUnitStarter.java:54)
+"

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

@@ -38,7 +38,13 @@ public class MergeApairClockPoint extends AbstractAdjustClockPointAction {
 
             if (startPointDTO.getPointType() == ClockPointEnum.START && endPointDTO.getPointType() == ClockPointEnum.END){
                 int startScheduleIndex = getStartScheduleIndex(startPointDTO.getClassTime(),scheduleResult);
+                if (Utils.ifAskforOrEvctionClassSegment(startPointDTO.getClassSegmentType())){
+                    startScheduleIndex = getEndScheduleIndex(startPointDTO.getClassTime(),scheduleResult);
+                }
                 int endScheduleIndex = getEndScheduleIndex(endPointDTO.getClassTime(),scheduleResult);
+                if (Utils.ifAskforOrEvctionClassSegment(endPointDTO.getClassSegmentType())){
+                    endScheduleIndex = getStartScheduleIndex(endPointDTO.getClassTime(),scheduleResult);
+                }
                 if (startScheduleIndex == endScheduleIndex){
                     //同属一个班段不用合并
                     i = i+1;

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-06-21");
-//            paramMap.put("endDate","2024-06-21");
-//            paramMap.put("userIds","81");
+//            paramMap.put("startDate","2024-05-24");
+//            paramMap.put("endDate","2024-05-24");
+//            paramMap.put("userIds","304");
 
             String startDate = Util.null2String(paramMap.get("startDate"));
             String startBeforeDate = DateUtil.beforeDay(startDate,2);
@@ -78,7 +78,7 @@ public class AttendanceanalysisAction {
                 for (Map<String,Object> userMap :userList){
 
                     String userId = userMap.get("id").toString();
-                    log.debug("***********analysis userId:{} start***********", userId);
+                    log.info("***********analysis userId:{} start***********", userId);
                     //出勤结果，进出时间
                     Map<String,Map<String,Object>> clockInTimeMap = Maps.newHashMap();
                     /**获得人员考勤项目*/

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

@@ -248,6 +248,14 @@ public class PersongroupCommonUtil {
         return result;
     }
 
+    /**
+     * 删除过期规律排班数据
+     */
+    public static void deleteExpireData(String regularId,String edate){
+        String sql = "delete from uf_pbjg where pbgl=? and bcrq > ?";
+        DbTools.update(sql,regularId,edate);
+    }
+
 
     /**
      * 日历排班插入排班结果公共方法

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

@@ -185,6 +185,8 @@ public class DayRegularScheduling implements RegularScheduling{
 
         /**插入排班结果表*/
         PersongroupCommonUtil.insertShiftSchedulingResults(organizationList,insertDataList,formmodeid);
+        //删除过期数据
+        PersongroupCommonUtil.deleteExpireData(id,edate);
 
     }
 }

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

@@ -177,5 +177,7 @@ public class MonthRegularScheduling implements RegularScheduling{
         }
         /**插入排班结果表*/
         PersongroupCommonUtil.insertShiftSchedulingResults(organizationList,insertDataList,formmodeid);
+        //删除过期数据
+        PersongroupCommonUtil.deleteExpireData(id,edate);
     }
 }

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

@@ -182,6 +182,8 @@ public class WeekRegularScheduling implements RegularScheduling{
 
         /**插入排班结果表*/
         PersongroupCommonUtil.insertShiftSchedulingResults(organizationList,insertDataList,formmodeid);
+        //删除过期数据
+        PersongroupCommonUtil.deleteExpireData(id,edate);
     }
 
     public int getDayOfWeek(DayOfWeek dayOfWeek){

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

@@ -186,5 +186,8 @@ public class YearRegularScheduling implements RegularScheduling{
 
         /**插入排班结果表*/
         PersongroupCommonUtil.insertShiftSchedulingResults(organizationList,insertDataList,formmodeid);
+        //删除过期数据
+        PersongroupCommonUtil.deleteExpireData(id,edate);
+
     }
 }

src/com/engine/attendance/component/persongroup/web/SchedulingResultsAction.java

@@ -70,4 +70,22 @@ public class SchedulingResultsAction {
             return ApiReturnTools.error("500","generateSchedule error");
         }
     }
+    /**
+     * 根据规律排班，排班对象以及日期区间删除排班结果
+     * @return
+     */
+    @POST
+    @Path("/deleteByRegularSchedule")
+    @Produces({"text/plain"})
+    public String deleteByRegularSchedule(@Context HttpServletRequest request, @Context HttpServletResponse response) {
+        try {
+            Map<String,Object> paramMap = ParamUtil.request2Map(request);
+            Map<String,Object> dataMap = basicsetService.generateSchedule(paramMap);
+            return ApiReturnTools.success(dataMap);
+        }catch (Exception e){
+            log.error("execute fail,catch error: [{}]",e);
+            return ApiReturnTools.error("500","generateSchedule error");
+        }
+    }
+
 }

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

@@ -402,19 +402,19 @@ public class Utils<T> {
 
             if (DateUtil.getTime(kssj).compareTo(DateUtil.getTime(dtkssj)) <=0 && DateUtil.getTime(jssj).compareTo(DateUtil.getTime(dtjssj)) >=0){
                 //休息时间在请假时间中间
-                betweenMinutes = DateUtil.getBetWeenMinutes(dtkssj,dtjssj);
+                betweenMinutes += DateUtil.getBetWeenMinutes(dtkssj,dtjssj);
                 log.debug("休息时间在请假时间中间");
             }else if (DateUtil.getTime(kssj).compareTo(DateUtil.getTime(dtkssj)) <=0 && DateUtil.getTime(jssj).compareTo(DateUtil.getTime(dtjssj)) <=0 && DateUtil.getTime(jssj).compareTo(DateUtil.getTime(dtkssj)) >=0){
                 //休息时间在请假时间 右边
-                betweenMinutes = DateUtil.getBetWeenMinutes(dtkssj,jssj);
+                betweenMinutes += DateUtil.getBetWeenMinutes(dtkssj,jssj);
                 log.debug("休息时间在请假时间 右边");
             }else if (DateUtil.getTime(kssj).compareTo(DateUtil.getTime(dtkssj)) >=0 && DateUtil.getTime(jssj).compareTo(DateUtil.getTime(dtjssj)) >=0 && DateUtil.getTime(kssj).compareTo(DateUtil.getTime(dtjssj)) <=0){
                 //休息时间在请假时间 左边
-                betweenMinutes = DateUtil.getBetWeenMinutes(kssj,dtjssj);
+                betweenMinutes += DateUtil.getBetWeenMinutes(kssj,dtjssj);
                 log.debug("休息时间在请假时间 左边");
             }else if (DateUtil.getTime(kssj).compareTo(DateUtil.getTime(dtkssj)) >=0 && DateUtil.getTime(jssj).compareTo(DateUtil.getTime(dtjssj)) <=0){
                 //请假时间在休息时间中间
-                betweenMinutes = 0;
+                betweenMinutes += DateUtil.getBetWeenMinutes(kssj,jssj);;
                 log.debug("请假时间在休息时间中间");
             }
         }

test/Test.java

@@ -15,6 +15,7 @@ import java.util.stream.Collectors;
 
 public class Test {
     public static void main(String[] args) {
+        System.out.println(DateUtil.getBetWeenMinutes("2024-06-28 17:17","2024-06-28 22:29"));
         System.out.println((int) Math.ceil(Double.valueOf("0.18")*60));
 //        List<Integer> list = Lists.newArrayList();
 //        aa(list);

test/test/TestAction.java

@@ -0,0 +1,18 @@
+package test;
+
+import lombok.extern.slf4j.Slf4j;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+
+@Slf4j
+public class TestAction implements Action {
+    @Override
+    public String execute(RequestInfo requestInfo) {
+        log.info("TestAction ");
+
+        new Thread(new TestRunnable(requestInfo,requestInfo.getRequestid())).start();
+
+
+        return Action.SUCCESS;
+    }
+}

test/test/TestRunnable.java

@@ -0,0 +1,31 @@
+package test;
+
+import lombok.extern.slf4j.Slf4j;
+import weaver.soa.workflow.request.RequestInfo;
+import weaver.soa.workflow.request.RequestService;
+
+@Slf4j
+public class TestRunnable implements Runnable{
+
+    private RequestInfo requestInfo;
+    private String requestId;
+    public TestRunnable(RequestInfo requestInfo,String requestId){
+        this.requestInfo=requestInfo;
+        this.requestId=requestId;
+    }
+    @Override
+    public void run() {
+        try {
+            log.info("TestRunnable start");
+            Thread.sleep(10000);
+            log.info("TestRunnable start  222");
+            RequestService requestService = new RequestService();
+//            requestService.setSubmitToNodeid("366");
+//            requestService.saveRequest(requestInfo);
+
+            requestService.nextNodeBySubmit(requestInfo,requestInfo.getRequestManager().getRequestid(),24,"自动提交11111");
+        }catch (Exception e){
+
+        }
+    }
+}