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

Merge remote-tracking branch 'origin/main'

Browse Source
zm_dev
sy 10 months ago
parent 10475db6b3 c644e2a0ea
commit abf310ecd3
41 changed files with 4511 additions and 92 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.

77
.idea/workspace.xml
Unescape Escape View File

@ -10,18 +10,20 @@
</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 afterPath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/cmd/DeleteBatchScheduleCmd.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/WEB-INF/prop/weaver.properties" beforeDir="false" afterPath="$PROJECT_DIR$/WEB-INF/prop/weaver.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/WEB-INF/sqllog/ecologysql" beforeDir="false" afterPath="$PROJECT_DIR$/WEB-INF/sqllog/ecologysql" afterDir="false" />
<change beforePath="$PROJECT_DIR$/log/sdk.log" beforeDir="false" afterPath="$PROJECT_DIR$/log/sdk.log" afterDir="false" />
<change beforePath="$PROJECT_DIR$/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/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/service/SchedulingResultsService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/service/SchedulingResultsService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/service/impl/SchedulingResultsServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/service/impl/SchedulingResultsServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/web/SchedulingResultsAction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/web/SchedulingResultsAction.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/vacation/cmd/VocationCmd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/vacation/cmd/VocationCmd.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/vacation/service/impl/VocationServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/vacation/service/impl/VocationServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/common/cmd/GetPersonDateBySuitOrganzation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/common/cmd/GetPersonDateBySuitOrganzation.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/common/util/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/common/util/Utils.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
@ -65,7 +67,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$/log/interceptSql" />
<property name="nodejs_package_manager_path" value="npm" />
<property name="project.structure.last.edited" value="Artifacts" />
<property name="project.structure.proportion" value="0.15" />
@ -78,20 +80,20 @@
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="D:\项目备份\考勤\hrm-attendance\log\interceptSql" />
<recent name="D:\项目备份\考勤\hrm-attendance\test" />
<recent name="D:\项目备份\考勤\hrm-attendance\src" />
<recent name="D:\项目备份\考勤\hrm-attendance" />
<recent name="D:\项目备份\考勤\hrm-attendance\workflow\request\hrmattendance" />
<recent name="D:\项目备份\考勤\hrm-attendance\src\com\engine\jucailin\cmd\personGroup" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="D:\项目备份\考勤\hrm-attendance\src\com\engine\jucailin\cmd\calendar" />
</key>
<key name="CopyClassDialog.RECENTS_KEY">
<recent name="web" />
<recent name="workflow" />
<recent name="" />
<recent name="com.engine.attendance.attendanceanalysis.cmd.getclockInpoint" />
<recent name="vocation" />
<recent name="calendarscheduling" />
</key>
</component>
<component name="RunAnythingCache">
@ -99,7 +101,7 @@
<command value="organzationList" />
</option>
</component>
<component name="RunManager" selected="JUnit.Test.testAnalysis">
<component name="RunManager" selected="JUnit.TestSchedulingResultsAction.test1">
<configuration name="Test" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="Test" />
<module name="hrm-attendance" />
@ -108,24 +110,33 @@
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="TestMethod" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="TestMethod" />
<configuration name="TestObj" type="Application" factoryName="Application" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="TestObj" />
<module name="hrm-attendance" />
<shortenClasspath name="MANIFEST" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="TestObj" type="Application" factoryName="Application" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="TestObj" />
<module name="hrm-attendance" />
<configuration default="true" type="Application" factoryName="Application">
<shortenClasspath name="MANIFEST" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration default="true" type="Application" factoryName="Application">
<configuration name="Test1.test1" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="hrm-attendance" />
<shortenClasspath name="MANIFEST" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="workflow.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="PACKAGE_NAME" value="workflow" />
<option name="MAIN_CLASS_NAME" value="workflow.Test1" />
<option name="METHOD_NAME" value="test1" />
<option name="TEST_OBJECT" value="method" />
<method v="2">
<option name="Make" enabled="true" />
</method>
@ -147,24 +158,24 @@
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="Test.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.Test" />
<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="Test.testRealse3" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<configuration name="Test.testAnalysis" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="hrm-attendance" />
<shortenClasspath name="MANIFEST" />
<extension name="coverage">
@ -175,7 +186,7 @@
</extension>
<option name="PACKAGE_NAME" value="TestAttendanceAllowance" />
<option name="MAIN_CLASS_NAME" value="TestAttendanceAllowance.Test" />
<option name="METHOD_NAME" value="testRealse3" />
<option name="METHOD_NAME" value="testAnalysis" />
<option name="TEST_OBJECT" value="method" />
<method v="2">
<option name="Make" enabled="true" />
@ -190,11 +201,11 @@
</configuration>
<recent_temporary>
<list>
<item itemvalue="JUnit.TestSchedulingResultsAction.test1" />
<item itemvalue="JUnit.Test1.test1" />
<item itemvalue="JUnit.Test.testAnalysis" />
<item itemvalue="Application.Test" />
<item itemvalue="JUnit.Test2.testAnalysis" />
<item itemvalue="JUnit.Test.testRealse3" />
<item itemvalue="Application.TestMethod" />
</list>
</recent_temporary>
</component>
@ -694,7 +705,9 @@
<workItem from="1719757945342" duration="1933000" />
<workItem from="1719797909327" duration="5196000" />
<workItem from="1719812427959" duration="2488000" />
<workItem from="1719816602545" duration="2526000" />
<workItem from="1719816602545" duration="11043000" />
<workItem from="1719884256412" duration="1573000" />
<workItem from="1719898656034" duration="14418000" />
</task>
<servers />
</component>
@ -758,11 +771,6 @@
<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/component/persongroup/commonutil/PersongroupCommonUtil.java</url>
<line>268</line>
<option name="timeStamp" value="172" />
</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>
@ -778,6 +786,11 @@
<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>
</breakpoints>
</breakpoint-manager>
<watches-manager>

44
WEB-INF/prop/weaver.properties
Unescape Escape View File

@ -1,8 +1,23 @@
DriverClasses=oracle.jdbc.OracleDriver
#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
ecology.url = jdbc:oracle:thin:@192.168.0.106:1521:ecology
ecology.user = hrm_test
ecology.password = ecology
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
@ -11,21 +26,6 @@ ecology.maxidletime = 600
ecology.maxalivetime = 10
ecology.checktime = 3600
#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
ecology.isgoveproj = 0
LOG_FORMAT = yyyy.MM.dd'-'hh:mm:ss
DEBUG_MODE = false

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

@ -6975,3 +6975,193 @@
at com.intellij.rt.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:235)
at com.intellij.rt.junit.JUnitStarter.main(JUnitStarter.java:54)
"
"2024-07-02","17:44:02.156","loginID=null main-1","69""1-2061440682","null","null","delete","delete from uf_pbjg where id in (182857,182858,182859,182860),[]",")
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.component.persongroup.cmd.DeleteBatchScheduleCmd.execute(DeleteBatchScheduleCmd.java:96)
at com.engine.attendance.component.persongroup.cmd.DeleteBatchScheduleCmd.execute(DeleteBatchScheduleCmd.java:13)
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.component.persongroup.service.impl.SchedulingResultsServiceImpl.deleteBatchSchedule(SchedulingResultsServiceImpl.java:170)
at web.TestSchedulingResultsAction.test1(TestSchedulingResultsAction.java:20)
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-02","17:46:19.061","loginID=null main-1","54""1-754072705","null","null","delete","delete from uf_pbjg where bcrq >= ? and bcrq <= ? or ( pbdxry in (31)),[2024-07-05, ]",")
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.component.persongroup.cmd.DeleteBatchScheduleCmd.execute(DeleteBatchScheduleCmd.java:99)
at com.engine.attendance.component.persongroup.cmd.DeleteBatchScheduleCmd.execute(DeleteBatchScheduleCmd.java:13)
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.component.persongroup.service.impl.SchedulingResultsServiceImpl.deleteBatchSchedule(SchedulingResultsServiceImpl.java:170)
at web.TestSchedulingResultsAction.test1(TestSchedulingResultsAction.java:26)
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-02","17:47:54.209","loginID=null main-1","53""1-1160652496","null","null","delete","delete from uf_pbjg where bcrq >= ? and bcrq <= ? and ( pbdxry in (31)),[2024-07-05, ]",")
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.component.persongroup.cmd.DeleteBatchScheduleCmd.execute(DeleteBatchScheduleCmd.java:99)
at com.engine.attendance.component.persongroup.cmd.DeleteBatchScheduleCmd.execute(DeleteBatchScheduleCmd.java:13)
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.component.persongroup.service.impl.SchedulingResultsServiceImpl.deleteBatchSchedule(SchedulingResultsServiceImpl.java:170)
at web.TestSchedulingResultsAction.test1(TestSchedulingResultsAction.java:26)
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-02","17:49:04.742","loginID=null main-1","59""1-370475881","null","null","delete","delete from uf_pbjg where bcrq >= ? and bcrq <= ? and ( pbdxry in (31)),[2024-07-02, 2024-07-05]",")
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.component.persongroup.cmd.DeleteBatchScheduleCmd.execute(DeleteBatchScheduleCmd.java:99)
at com.engine.attendance.component.persongroup.cmd.DeleteBatchScheduleCmd.execute(DeleteBatchScheduleCmd.java:13)
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.component.persongroup.service.impl.SchedulingResultsServiceImpl.deleteBatchSchedule(SchedulingResultsServiceImpl.java:170)
at web.TestSchedulingResultsAction.test1(TestSchedulingResultsAction.java:26)
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-02","17:51:39.782","loginID=null main-1","54""1-246826139","null","null","delete","delete from uf_pbjg where bcrq >= ? and bcrq <= ? and pbtj=0 and ( pbdxry in (31)),[2024-07-06, 2024-07-09]",")
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.component.persongroup.cmd.DeleteBatchScheduleCmd.execute(DeleteBatchScheduleCmd.java:99)
at com.engine.attendance.component.persongroup.cmd.DeleteBatchScheduleCmd.execute(DeleteBatchScheduleCmd.java:13)
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.component.persongroup.service.impl.SchedulingResultsServiceImpl.deleteBatchSchedule(SchedulingResultsServiceImpl.java:170)
at web.TestSchedulingResultsAction.test1(TestSchedulingResultsAction.java:27)
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)
"

BIN
log/interceptSql/GetPersonDateBySuitOrganzation.class
View File

Binary file not shown.

BIN
log/interceptSql/VocationCmd.class
View File

Binary file not shown.

3940
log/sdk.log
View File

File diff suppressed because it is too large Load Diff

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

Binary file not shown.

105
src/com/engine/attendance/component/persongroup/cmd/DeleteBatchScheduleCmd.java
Unescape Escape View File

@ -0,0 +1,105 @@
package com.engine.attendance.component.persongroup.cmd;
import com.engine.common.biz.AbstractCommonCommand;
import com.engine.common.entity.BizLogContext;
import com.engine.common.util.DbTools;
import com.engine.core.interceptor.CommandContext;
import com.google.common.collect.Maps;
import lombok.extern.slf4j.Slf4j;
import weaver.general.Util;
import java.util.Map;
@Slf4j
public class DeleteBatchScheduleCmd extends AbstractCommonCommand<Map<String,Object>> {
public DeleteBatchScheduleCmd(Map<String,Object> params){
this.params=params;
}
@Override
public BizLogContext getLogContext() {
return null;
}
@Override
public Map<String, Object> execute(CommandContext commandContext) {
Map<String,Object> resultMap = Maps.newHashMap();
log.info("param : [{}]",params);
//开始日期
String startDate = Util.null2String(params.get("startDate"));
//结束日期
String endDate = Util.null2String(params.get("endDate"));
//排班途径
String pbtj = Util.null2String(params.get("pbtj"));
//人员排班对象
String pbdxry = Util.null2String(params.get("pbdxry"));
//人员分组排班对象
String pbdxryfz = Util.null2String(params.get("pbdxryfz"));
//部门排班对象
String pbdxbm = Util.null2String(params.get("pbdxbm"));
//分部排班对象
String pbdxfb = Util.null2String(params.get("pbdxfb"));
//主键id
String ids = Util.null2String(params.get("ids"));
//类型0:单个，1：批量
String type = Util.null2String(params.get("type"));
String sql = "delete from uf_pbjg ";
if (type.equals("0")){
}else if (type.equals("1")){
sql = sql + " where bcrq >= ? and bcrq <= ?";
}
if (!pbtj.equals("")){
sql = sql + " and pbtj="+pbtj;
}
String condition = "";
if (!"".equals(ids)){
if ("".equals(condition)){
condition = condition + " id in ("+ids+")";
}else {
condition = condition + " or id in ("+ids+")";
}
}
if (!"".equals(pbdxry)){
if ("".equals(condition)){
condition = condition + " pbdxry in ("+pbdxry+")";
}else {
condition = condition + " or pbdxry in ("+pbdxry+")";
}
}
if (!"".equals(pbdxryfz)){
if ("".equals(condition)){
condition = condition + " pbdxryfz in ("+pbdxryfz+")";
}else {
condition = condition + " or pbdxryfz in ("+pbdxryfz+")";
}
}
if (!"".equals(pbdxbm)){
if ("".equals(condition)){
condition = condition + " pbdxbm in ("+pbdxbm+")";
}else {
condition = condition + " or pbdxbm in ("+pbdxbm+")";
}
}
if (!"".equals(pbdxfb)){
if ("".equals(condition)){
condition = condition + " pbdxfb in ("+pbdxfb+")";
}else {
condition = condition + " or pbdxfb in ("+pbdxfb+")";
}
}
if (!"".equals(condition)){
log.info("DeleteBatchScheduleCmd sql :[{}]",sql);
if (type.equals("0")){
sql = sql +" where "+condition;
resultMap.put("result",DbTools.update(sql));
}else if (type.equals("1")){
sql = sql +" and ("+condition+")";
resultMap.put("result",DbTools.update(sql,startDate,endDate));
}
}
return resultMap;
}
}

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

@ -218,25 +218,12 @@ public class PersongroupCommonUtil {
}
boolean result = false;
if (psersons.size() >0){
String deleteSql = sql + " and pbdxry in ("+String.join(",",psersons)+")";
if (insertDataList.size() >0){
//老的排班结果删除
String pbgl = insertDataList.get(0).get("pbgl").toString();
String deleteSql = sql + " and pbgl = ?";
log.debug("deleteSql : {}",deleteSql);
DbTools.update(rs,deleteSql,startDate,endDate);
}
if (psersonsGroups.size() >0){
String deleteSql = sql + " and pbdxryfz in ("+String.join(",",psersonsGroups)+")";
log.debug("deleteSql : {}",deleteSql,startDate,endDate);
DbTools.update(rs,deleteSql,startDate,endDate);
}
if (departments.size() >0){
String deleteSql = sql + " and pbdxbm in ("+String.join(",",departments)+")";
log.debug("deleteSql : {}",deleteSql,startDate,endDate);
DbTools.update(rs,deleteSql,startDate,endDate);
}
if (subCompanys.size() >0){
String deleteSql = sql + " and pbdxfb in ("+String.join(",",subCompanys)+")";
log.debug("deleteSql : {}",deleteSql,startDate,endDate);
DbTools.update(rs,deleteSql,startDate,endDate);
DbTools.update(rs,deleteSql,startDate,endDate,pbgl);
}
if (addlist.size() >0){

7
src/com/engine/attendance/component/persongroup/service/SchedulingResultsService.java
Unescape Escape View File

@ -32,4 +32,11 @@ public interface SchedulingResultsService {
* @return
*/
Map<String,Object> generateSchedule(Map<String,Object> params);
/**
* 删除排班结果
* @param params
* @return
*/
Map<String,Object> deleteBatchSchedule(Map<String,Object> params);
}

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

@ -1,9 +1,6 @@
package com.engine.attendance.component.persongroup.service.impl;
import com.engine.attendance.component.persongroup.cmd.GenerateScheduleCmd;
import com.engine.attendance.component.persongroup.cmd.GetDatatableCmd;
import com.engine.attendance.component.persongroup.cmd.GetDatatableCountCmd;
import com.engine.attendance.component.persongroup.cmd.GetDatatableRecurrenceCmd;
import com.engine.attendance.component.persongroup.cmd.*;
import com.engine.attendance.component.persongroup.commonutil.PersongroupCommonUtil;
import com.engine.attendance.component.persongroup.service.SchedulingResultsService;
import com.engine.attendance.enums.CheckBoxEnum;
@ -166,4 +163,10 @@ public class SchedulingResultsServiceImpl extends Service implements SchedulingR
public Map<String, Object> generateSchedule(Map<String, Object> params) {
return commandExecutor.execute(new GenerateScheduleCmd(params));
}
@Override
public Map<String, Object> deleteBatchSchedule(Map<String, Object> params) {
return commandExecutor.execute(new DeleteBatchScheduleCmd(params));
}
}

8
src/com/engine/attendance/component/persongroup/web/SchedulingResultsAction.java
Unescape Escape View File

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

2
src/com/engine/attendance/vacation/cmd/VocationCmd.java
Unescape Escape View File

@ -77,7 +77,7 @@ public class VocationCmd extends AbstractCommonCommand<Map<String,Object>> {
vocation.put("ljcrglyfslwzValue",ljcrglyfslwzValue);
vocation.put("zyzValue",getUserIds(vocation));
}
log.debug("VocationCmd params: [{}]",params);
log.info("VocationCmd params: [{}]",params);
String edfffs = Util.null2String(vocationList.get(0).get("edfffs"));
for (HolidayGenerationWay holidayGenerationWay :rulers){
if (holidayGenerationWay.support(Integer.valueOf(edfffs))){

4
src/com/engine/attendance/vacation/service/impl/VocationServiceImpl.java
Unescape Escape View File

@ -41,7 +41,7 @@ public class VocationServiceImpl extends Service implements VocationService {
List<Map<String,Object>> dataList = Lists.newArrayList();
for (List<String> list : userPartions){
String querySql = sql + String.join(",",list) +")";
log.debug("querySql : [{}]",querySql);
log.info("querySql : [{}]",querySql);
List<Map<String,Object>> resultList = DbTools.getSqlToListKeySmallLetter(querySql);
resultList = resultList.stream().filter(e->"HrmCustomFieldByInfoType".equals(e.get("scope")) || "".equals(Util.null2String(e.get("scope")))).collect(Collectors.toList());
dataList.addAll(resultList);
@ -64,7 +64,7 @@ public class VocationServiceImpl extends Service implements VocationService {
needGenerateVocationMap.put(Util.null2String(map.get("key")),vocationMap.get(map.get("key")));
}
}
log.debug("VocationServiceImpl userId:{}, userList:{}",userId,userIdMap.get(userId));
log.info("VocationServiceImpl userId:{}, userList:{}",userId,userIdMap.get(userId));
for (Map.Entry<String, Object> e:needGenerateVocationMap.entrySet()){
if (e.getValue() != null && ((List<Map<String,Object>>)e.getValue()).size() > 0){
Map<String,Object> vocationParam = Maps.newHashMap();

18
src/com/engine/common/cmd/GetPersonDateBySuitOrganzation.java
Unescape Escape View File

@ -133,16 +133,16 @@ public class GetPersonDateBySuitOrganzation extends AbstractCommonCommand<Map<St
List<Map<String,Object>> hrmListByDepartAndSubCompanyIds = DbTools.getSqlToList(sql);
//部门id-人员id集合
Map<String,List<Map<String,Object>>> hrmListGroupByDepart = hrmListByDepartAndSubCompanyIds.stream().collect(Collectors.groupingBy(e->Util.null2String(e.get("departmentid"))));
log.debug("hrmListGroupByDepart : [{}]",hrmListGroupByDepart);
log.info("hrmListGroupByDepart : [{}]",hrmListGroupByDepart);
//分部id-人员id集合
Map<String,List<Map<String,Object>>> hrmListGroupBySubCompany = hrmListByDepartAndSubCompanyIds.stream().collect(Collectors.groupingBy(e->Util.null2String(e.get("subcompanyid1"))));
log.debug("hrmListGroupBySubCompany : [{}]",hrmListGroupBySubCompany);
log.info("hrmListGroupBySubCompany : [{}]",hrmListGroupBySubCompany);
//人员分组id-人员id集合
if (personOrganzationIds.size() >0){
//人员分组id-（假别，假期规则id）
Map<String,Set<String>> personGroupUserIds = getPersonGroupUserIds(personOrganzationIds);
log.debug("personGroupUserIds : [{}]",personGroupUserIds);
log.debug("personOrganzationMap : [{}]",personOrganzationMap);
log.info("personGroupUserIds : [{}]",personGroupUserIds);
log.info("personOrganzationMap : [{}]",personOrganzationMap);
for (Map.Entry<String,Object> entry : personOrganzationMap.entrySet()){
String personGroupId = entry.getKey();
//人员分组（假别，假期规则id）
@ -165,9 +165,9 @@ public class GetPersonDateBySuitOrganzation extends AbstractCommonCommand<Map<St
}
}
log.debug("before personMap : [{}]",personMap);
log.info("before personMap : [{}]",personMap);
//部门id
log.debug("departMentMap : [{}]",departMentMap);
log.info("departMentMap : [{}]",departMentMap);
for (Map.Entry<String,Object> entry : departMentMap.entrySet()){
String departMentId = entry.getKey();
//部门（假别，假期规则id）
@ -190,7 +190,7 @@ public class GetPersonDateBySuitOrganzation extends AbstractCommonCommand<Map<St
}
}
//分部id
log.debug("subCompanyMap : [{}]",subCompanyMap);
log.info("subCompanyMap : [{}]",subCompanyMap);
for (Map.Entry<String,Object> entry : subCompanyMap.entrySet()){
String subCompanyId = entry.getKey();
//分部（假别，假期规则id）
@ -212,7 +212,7 @@ public class GetPersonDateBySuitOrganzation extends AbstractCommonCommand<Map<St
}
}
}
log.debug("personMap : [{}]",personMap);
log.info("personMap : [{}]",personMap);
Map<String,Object> newpersonMap = Maps.newHashMap();
for (Map.Entry<String,Object> entry :personMap.entrySet()){
String userId = entry.getKey();
@ -267,7 +267,7 @@ public class GetPersonDateBySuitOrganzation extends AbstractCommonCommand<Map<St
}else {
sql = sql+ " and "+filters;
}
log.debug("getPersonnelGroupingByPerson filter sql : {}",sql);
log.info("getPersonnelGroupingByPerson filter sql : {}",sql);
List<Map<String,Object>> dataList = DbTools.getSqlToList(sql);
for (Map<String,Object> dataMap :dataList){
String hrmId = Util.null2String(dataMap.get("id"));

3
src/com/engine/common/util/Utils.java
Unescape Escape View File

@ -382,6 +382,9 @@ public class Utils<T> {
scheduleResult = scheduleResult.stream().filter(e -> ClassSegmentTypeEnum.REST_AND_DINE.getKey().equals(e.get("bdlx")) ||
ClassSegmentTypeEnum.REST_PERIOD.getKey().equals(e.get("bdlx")) || ClassSegmentTypeEnum.DINING_PERIOD.getKey().equals(e.get("bdlx"))).collect(Collectors.toList());
int betweenMinutes = DateUtil.getBetWeenMinutes(kssj,jssj)-removeTime(kssj,jssj,scheduleResult,analysisDate);
if (betweenMinutes < 0){
betweenMinutes = 0;
}
return betweenMinutes;
}

BIN
target/classes/com/engine/attendance/component/persongroup/cmd/DeleteBatchScheduleCmd.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/SchedulingResultsService.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/component/persongroup/web/SchedulingResultsAction.class
View File

Binary file not shown.

BIN
target/classes/com/engine/attendance/vacation/cmd/VocationCmd.class
View File

Binary file not shown.

BIN
target/classes/com/engine/attendance/vacation/service/impl/VocationServiceImpl.class
View File

Binary file not shown.

BIN
target/classes/com/engine/attendance/workflow/action/test/TestAction.class
View File

Binary file not shown.

BIN
target/classes/com/engine/attendance/workflow/action/test/TestRunnable.class
View File

Binary file not shown.

BIN
target/classes/com/engine/common/cmd/GetPersonDateBySuitOrganzation.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/TestAttendanceAllowance/Test.class
View File

Binary file not shown.

BIN
target/test-classes/Tset_sy.class
View File

Binary file not shown.

BIN
target/test-classes/test/TestAction.class
View File

Binary file not shown.

BIN
target/test-classes/test/TestRunnable.class
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
target/test-classes/workflow/Test1.class
View File

Binary file not shown.

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

@ -0,0 +1,29 @@
package web;
import com.engine.attendance.component.persongroup.service.SchedulingResultsService;
import com.engine.attendance.component.persongroup.service.impl.SchedulingResultsServiceImpl;
import com.engine.common.util.ServiceUtil;
import com.google.common.collect.Maps;
import org.junit.Test;
import java.util.Map;
public class TestSchedulingResultsAction extends beforlog {
@Test
public void test1() {
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("type","1");
params.put("startDate","2024-07-06");
params.put("endDate","2024-07-09");
params.put("pbdxry","31");
params.put("pbtj","0");
basicsetService.deleteBatchSchedule(params);
}
}

142
test/web/beforlog.java
Unescape Escape View File

@ -0,0 +1,142 @@
package web;
import org.easymock.EasyMock;
import org.junit.After;
import org.junit.Before;
import weaver.general.GCONST;
import weaver.hrm.User;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
public class beforlog {
@Before
public void init(){
GCONST.setRootPath("");
GCONST.setServerName("ecology");
System.out.println("----------------开始----------------");
}
@After
public void demoAfter() throws Exception{
System.out.println("-----------------结束---------------");
}
public HttpServletRequest CreateHttpServletOrmap(Map<String,Object> map){
HttpServletRequest httpServletRequest = (HttpServletRequest) EasyMock.createMock(HttpServletRequest.class);
// Map<String, String> map2 = new HashMap<>();
for (String key:map.keySet() ) {
// String[] values=
// map2.put(key,map.get(key).toString());
EasyMock.expect(httpServletRequest.getParameter(key)).andReturn(map.get(key).toString());
}
// EasyMock.expect(httpServletRequest.getParameterMap()).andReturn(map2);
EasyMock.expect(httpServletRequest.getParameter("2123")).andReturn("123");
HttpSession session = EasyMock.createStrictMock(HttpSession.class);
//session管理
EasyMock.expect(httpServletRequest.getParameter("f_weaver_belongto_userid")).andReturn("1");
EasyMock.expect(httpServletRequest.getParameter("f_weaver_belongto_usertype")).andReturn("0");
EasyMock.expect(session.getAttribute("weaver_user@bean")).andReturn(new User(290464));
EasyMock.expect(httpServletRequest.getSession(true)).andStubReturn(session);
EasyMock.replay(httpServletRequest, session);
return httpServletRequest;
}
public HttpServletRequest CreateHttpServletOr(Map<String,Object> map){
HttpServletRequest httpServletRequest = (HttpServletRequest) EasyMock.createMock(HttpServletRequest.class);
Map<String, String[]> map2 = new HashMap<>();
for (String key:map.keySet() ) {
// String[] values=
map2.put(key,map.get(key).toString().split(""));
EasyMock.expect(httpServletRequest.getParameter(key)).andReturn(map.get(key).toString());
}
// EasyMock.expect(httpServletRequest.getParameterMap()).andReturn(map2);
EasyMock.expect(httpServletRequest.getParameter("2123")).andReturn("123");
HttpSession session = EasyMock.createStrictMock(HttpSession.class);
//session管理
EasyMock.expect(httpServletRequest.getParameter("f_weaver_belongto_userid")).andReturn("26347");
EasyMock.expect(httpServletRequest.getParameter("f_weaver_belongto_usertype")).andReturn("0");
EasyMock.expect(session.getAttribute("weaver_user@bean")).andReturn(new User(26347));
EasyMock.expect(httpServletRequest.getSession(true)).andStubReturn(session);
EasyMock.replay(httpServletRequest, session);
return httpServletRequest;
}
public HttpServletRequest CreateHttpServletworkflowtodu(Map<String,Object> map,Map<String,String> headmap){
HttpServletRequest httpServletRequest = (HttpServletRequest) EasyMock.createMock(HttpServletRequest.class);
Map<String, String> map2 = new HashMap<>();
for (String key:map.keySet() ) {
// String[] values=
EasyMock.expect(httpServletRequest.getParameter(key)).andReturn(map.get(key).toString());
}
for (String key:headmap.keySet() ) {
// String[] values=
EasyMock.expect(httpServletRequest.getHeader(key)).andReturn(headmap.get(key).toString());
}
EasyMock.expect(httpServletRequest.getParameter("2123")).andReturn("123");
HttpSession session = EasyMock.createStrictMock(HttpSession.class);
//session管理
EasyMock.expect(httpServletRequest.getParameter("f_weaver_belongto_userid")).andReturn("26347");
EasyMock.expect(httpServletRequest.getParameter("f_weaver_belongto_usertype")).andReturn("0");
EasyMock.expect(session.getAttribute("weaver_user@bean")).andReturn(new User(26347));
EasyMock.expect(httpServletRequest.getSession(true)).andStubReturn(session);
EasyMock.replay(httpServletRequest, session);
return httpServletRequest;
}
public String getUrl(){
String value= this.getClass().getResource("/").getPath();
if(value.length()>1){
return value.substring(1,value.length()-1);
}
return value;
}
public String loadjson(String path) {
path=getUrl()+path;
String str = "";
try {
File file = new File(path);// 定义一个file对象，用来初始化FileReader
FileReader reader = new FileReader(file);// 定义一个fileReader对象，用来初始化BufferedReader
BufferedReader bReader = new BufferedReader(reader);// new一个BufferedReader对象，将文件内容读取到缓存
StringBuilder sb = new StringBuilder();// 定义一个字符串缓存，将字符串存放缓存中
String s = "";
while ((s = bReader.readLine()) != null) {// 逐行读取文件内容，不读取换行符和末尾的空格
sb.append(s + "\n");// 将读取的字符串添加换行符后累加存放在缓存中
System.out.println(s);
}
bReader.close();
str = sb.toString();
return str;
} catch (IOException e) {
e.printStackTrace();
}
return str;
}
}
Write Preview
Loading…
Cancel
Save