liuliang
/
hrm-attendance
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

Browse Source
zm_dev
liuliang 10 months ago
parent 9b526d31a7
commit 9107be551e
36 changed files with 3649 additions and 63 deletions
Show Stats Download Patch File Download Diff File

BIN
.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat
View File

Binary file not shown.

102
.idea/workspace.xml
Unescape Escape View File

@ -10,21 +10,40 @@
</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/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/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/component/calendarscheduling/service/impl/WorkRulesServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/cmd/GetDatatableCmd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/cmd/GetDatatableCmd.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/cmd/GetDatatableCountCmd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/cmd/GetDatatableCountCmd.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/cmd/GetDatatableRecurrenceCmd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/cmd/GetDatatableRecurrenceCmd.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/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/service/impl/PersonGroupServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/service/impl/PersonGroupServiceImpl.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/component/calendarscheduling/service/impl/WorkRulesServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/cmd/GetDatatableCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/cmd/GetDatatableCmd.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/cmd/GetDatatableCountCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/cmd/GetDatatableCountCmd.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/cmd/GetDatatableRecurrenceCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/cmd/GetDatatableRecurrenceCmd.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/commonutil/PersongroupCommonUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/commonutil/PersongroupCommonUtil.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/job/scheduling/tactics/DayRegularScheduling.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/job/scheduling/tactics/DayRegularScheduling.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/job/scheduling/tactics/MonthRegularScheduling.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/job/scheduling/tactics/MonthRegularScheduling.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/job/scheduling/tactics/WeekRegularScheduling.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/job/scheduling/tactics/WeekRegularScheduling.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/job/scheduling/tactics/YearRegularScheduling.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/job/scheduling/tactics/YearRegularScheduling.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/service/impl/SchedulingResultsServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/service/impl/SchedulingResultsServiceImpl.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/workflow/service/AskForLeaveService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/workflow/service/AskForLeaveService.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/attendance/workflow/web/AskForLeaveAction.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/workflow/web/AskForLeaveAction.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/common/util/DateUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/common/util/DateUtil.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/web/TestSchedulingResultsAction.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/web/TestSchedulingResultsAction.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/test/web/TestSchedulingResultsAction.java" beforeDir="false" afterPath="$PROJECT_DIR$/test/web/TestSchedulingResultsAction.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -67,7 +86,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 +120,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 +160,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 +188,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 +220,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 +726,13 @@
<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="5847000" />
</task>
<servers />
</component>
@ -758,19 +783,9 @@
</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" />
</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" />
</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>
@ -781,16 +796,31 @@
<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>
<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" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/GetScheduleResultListCmd.java</url>
<line>47</line>
<option name="timeStamp" value="189" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/service/impl/SchedulingResultsServiceImpl.java</url>
<line>35</line>
<option name="timeStamp" value="190" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/impl/UtilServiceImpl.java</url>
<line>42</line>
<option name="timeStamp" value="191" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/impl/UtilServiceImpl.java</url>
<line>40</line>
<option name="timeStamp" value="192" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
<watches-manager>

205
WEB-INF/sqllog/ecologysql
Unescape Escape View File

@ -7165,3 +7165,208 @@
at com.intellij.rt.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:235)
at com.intellij.rt.junit.JUnitStarter.main(JUnitStarter.java:54)
"
"2024-07-03","15:52:10.773","loginID=null main-1","60""1-1015122628","null","null","update","update uf_jcl_kq_cqjg set cqsc=0.0,cqzt=1,fxrq='2024-07-03 15:52:10',rqlx=0,sfxx=0,bc=1,bcbdxx='09:00-12:00|13:00-18:00',xm1=7,sc1=1,xm2=7,sc2=1,xm3=NULL,sc3=NULL,xm4=NULL,sc4=NULL,xm5=NULL,sc5=NULL,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=?,[31, 2024-07-01]",")
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-07-03","15:52:11.224","loginID=null main-1","67""1-1015122628","null","null","delete","delete from uf_jcl_kq_jbjg where lyid=?,[10151]",")
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-07-03","15:52:11.337","loginID=null main-1","78""1-1015122628","null","null","delete","delete from uf_jcl_kq_jqye where lyid=?,[10151]",")
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-07-03","15:52:11.463","loginID=null main-1","65""1-1015122628","null","null","update","update uf_jcl_kq_jbjg set lyid =? where lyid=?,[10151, 31-2024-07-03]",")
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-07-03","15:52:11.573","loginID=null main-1","81""1-1015122628","null","null","update","update uf_jcl_kq_jqye set lyid =? where lyid=?,[10151, 31-2024-07-03]",")
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)
"

3272
log/sdk.log
View File

File diff suppressed because one or more lines are too long

BIN
out/artifacts/hrm_attendance/hrm-attendance.jar
View File

Binary file not shown.

6
src/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.java
Unescape Escape View File

@ -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-01");
// paramMap.put("endDate","2024-07-01");
// paramMap.put("userIds","31");
String startDate = Util.null2String(paramMap.get("startDate"));
String startBeforeDate = DateUtil.beforeDay(startDate,2);

5
src/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl.java
Unescape Escape View File

@ -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());

2
src/com/engine/attendance/component/persongroup/cmd/GetDatatableCmd.java
Unescape Escape View File

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

1
src/com/engine/attendance/component/persongroup/cmd/GetDatatableCountCmd.java
Unescape Escape View File

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

47
src/com/engine/attendance/component/persongroup/cmd/GetDatatableRecurrenceCmd.java
Unescape Escape View File

@ -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);
}
}
}

6
src/com/engine/attendance/component/persongroup/commonutil/PersongroupCommonUtil.java
Unescape Escape View File

@ -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 (bcsdxx,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);
}

8
src/com/engine/attendance/component/persongroup/job/scheduling/tactics/DayRegularScheduling.java
Unescape Escape View File

@ -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]);

7
src/com/engine/attendance/component/persongroup/job/scheduling/tactics/MonthRegularScheduling.java
Unescape Escape View File

@ -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]);

7
src/com/engine/attendance/component/persongroup/job/scheduling/tactics/WeekRegularScheduling.java
Unescape Escape View File

@ -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]);

7
src/com/engine/attendance/component/persongroup/job/scheduling/tactics/YearRegularScheduling.java
Unescape Escape View File

@ -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]);

11
src/com/engine/attendance/component/persongroup/service/impl/PersonGroupServiceImpl.java
Unescape Escape View File

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

5
src/com/engine/attendance/component/persongroup/service/impl/SchedulingResultsServiceImpl.java
Unescape Escape View File

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

BIN
target/classes/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl.class
View File

Binary file not shown.

BIN
target/classes/com/engine/attendance/component/persongroup/cmd/GetDatatableCmd.class
View File

Binary file not shown.

BIN
target/classes/com/engine/attendance/component/persongroup/cmd/GetDatatableCountCmd.class
View File

Binary file not shown.

BIN
target/classes/com/engine/attendance/component/persongroup/cmd/GetDatatableRecurrenceCmd.class
View File

Binary file not shown.

BIN
target/classes/com/engine/attendance/component/persongroup/commonutil/PersongroupCommonUtil.class
View File

Binary file not shown.

BIN
target/classes/com/engine/attendance/component/persongroup/job/scheduling/tactics/DayRegularScheduling.class
View File

Binary file not shown.

BIN
target/classes/com/engine/attendance/component/persongroup/job/scheduling/tactics/MonthRegularScheduling.class
View File

Binary file not shown.

BIN
target/classes/com/engine/attendance/component/persongroup/job/scheduling/tactics/WeekRegularScheduling.class
View File

Binary file not shown.

BIN
target/classes/com/engine/attendance/component/persongroup/job/scheduling/tactics/YearRegularScheduling.class
View File

Binary file not shown.

BIN
target/classes/com/engine/attendance/component/persongroup/service/impl/SchedulingResultsServiceImpl.class
View File

Binary file not shown.

BIN
target/classes/com/engine/attendance/workflow/action/askforleave/BatchAskForLeaveWorkFlowArchivingAction.class
View File

Binary file not shown.

BIN
target/classes/com/engine/attendance/workflow/action/askforleave/BatchAskForLeaveWorkFlowSubmitAction.class
View File

Binary file not shown.

BIN
target/classes/com/engine/attendance/workflow/service/AskForLeaveService.class
View File

Binary file not shown.

BIN
target/classes/com/engine/attendance/workflow/service/impl/AskForLeaveServiceImpl.class
View File

Binary file not shown.

BIN
target/classes/com/engine/attendance/workflow/web/AskForLeaveAction.class
View File

Binary file not shown.

BIN
target/classes/com/engine/common/util/DateUtil.class
View File

Binary file not shown.

BIN
target/classes/com/engine/common/util/Utils.class
View File

Binary file not shown.

BIN
target/test-classes/web/TestSchedulingResultsAction.class
View File

Binary file not shown.

21
test/web/TestSchedulingResultsAction.java
Unescape Escape View File

@ -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);
}
}

Write Preview
Loading…
Cancel
Save