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

排班结果过期以及使用范围没有其他人的情况

Browse Source
zm_dev
liuliang 10 months ago
parent d7e19bcba3
commit 54ef963716
16 changed files with 109 additions and 17 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.

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

Binary file not shown.

2
.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s
Unescape Escape View File

@ -1 +1 @@
аyГ~цЭ|дй~Й~хд|И}ф─Л~ш}Т~М|юй~с}С}ю─Я}У}Ь~к~Х}Н~г}ЭЖ|б}О}Ъ┌рqчhаjЖkЛjВhТjгiлjфkзiУhЭlЩkуoжpжxЯuЭtЧvВvтwЛvа{иxяyТxЙvЮxЦvБyиxрzпwЧvзxа▌Ы▒Ч▓ш░С⌠ж░М░Ч▒С▌ъ▐м▌Ж▐С▒Ъ▐з░н▌Н▐Ш░з▐Э▄д▄Д▒о░Щ▒Ъ▀Д⌠в░к▐д█Щ▌Р▐ы▒щ░ч▒А░я▐П▌Ь░э░я▒Ю▓ч▌ц▒П▒Г▓З▌У█Ъ░л▌о▐щ▐б▐Э█х■д░Ъ█т▐з▌Ж▓Т▌Н▐Б▒У▐щ█П▒с░Щ▌л░э⌠р▐р▌Ц▓ь░к▓м▐И█п█Й▌П▌Р▒ж░п▐А▐л█и▒Ш▓Ф█м▄ю░м▌Ш▌д▐ш░ж▌и▌И▐Ж▐ъ▐В▌н▒л▐О▐Й█Н└иwбsСsЪvцsЕwаtПsщyАlГtДoфsшqлlЬqЦpЗrКlыsЖsвuрsХmхoьqЛrщlйjНZК\т^Й\ФZоVфZХXШ\РVИhбwчxкzБyп{Шzб|ш{оxОxЙ|фzд|яwи{ЗvБyК|ЦVеZюUаYфSТYхXе\цXэaцcвeщ_ЮWхWц^бTмRюTЫTПZсWж[ъTЕ]ы[ЪWТRДWгVоZГZЧUЮYСQсXЮWБYЦ[кZшgО~В~ыzю~л{РzвyК{Бxи~ц|М{ъ~тж|Ф}к~н}ы│чaчdВ]вhп]вaь^ГaК`гaй^ж_Ш]С]И]в^Т^в^и]Т]Х`ЯkКgшgюgЩgюhШcТ]жWЬkшiцqжh
аyГ~цЭ|дй~Й~хд|И}ф─Л~ш}Т~М|юй~с}С}ю─Я}У}Ь~к~Х}Н~г}ЭЖ|б}О}Ъ┌рqчhаjЖkЛjВhТjгiлjфkзiУhЭlЩkуoжpжxЯuЭtЧvВvтwЛvа{иxяyТxЙvЮxЦvБyиxрzпwЧvзxа▌Ы▒Ч▓ш░С⌠ж░М░Ч▒С▌ъ▐м▌Ж▐С▒Ъ▐з░н▌Н▐Ш░з▐Э▄д▄Д▒о░Щ▒Ъ▀Д⌠в░к▐д█Щ▌Р▐ы▒щ░ч▒А░я▐П▌Ь░э░я▒Ю▓ч▌ц▒П▒Г▓З▌У█Ъ░л▌о▐щ▐б▐Э█х■д░Ъ█т▐з▌Ж▓Т▌Н▐Б▒У▐щ█П▒с░Щ▌л░э⌠р▐р▌Ц▓ь░к▓м▐И█п█Й▌П▌Р▒ж░п▐А▐л█и▒Ш▓Ф█м▄ю░м▌Ш▌д▐ш░ж▌и▌И▐Ж▐ъ▐В▌н▒л▐О▐Й█Н└иwбsСsЪvцsЕwаtПsщyАlГtДoфsшqлlЬqЦpЗrКlыsЖsвuрsХmхoьqЛrщlйjНZК\т^Й\ФZоVфZХXШ\РVИhбwчxкzБyп{Шzб|ш{оxОxЙ|фzд|яwи{ЗvБyК|ЦVеZюUаYфSТYхXе\цXэaцcвeщ_ЮWхWц^бTмRюTЫTПZсWж[ъTЕ]ы[ЪWТRДWгVоZГZЧUЮYСQсXЮWБYЦ[кZшgО~В~ыzю~л{РzвyК{Бxи~ц|М{ъ~тж|Ф}к~н}ы│чaчdВ]вhп]вaь^ГaК`гaй^ж_Ш]С]И]в^Т^в^и]Т]Х`ЯkКgшgюgЩgюhШcТ]жWЬkшiцqжhЧoяLбLшLюMБMГMКMКMНMсNХMКMНMГMХMЙMНMФMХMЯKДKЕKЙKюKаJцJЪJЕKЦKБKоLшKФKГKГKЕKИKЕKЕKИJюJФJсKЕKИKФKЕKФKДKГKГKпLДKЕKшKжJаJХJДKЕKХKЦKоLЦKДKЦKИKГKФKЕKюKдJЧIсKБKЦKХKГKЕKДKГKЕKГKрLФKГKКJЪIсJтKЕKФKГKДKоLФKФKФKДKЙKДKвKшJюJФJЧKДKДKДKДK

32
.idea/workspace.xml
Unescape Escape View File

@ -10,18 +10,19 @@
</component>
<component name="ChangeListManager">
<list default="true" id="baeb3dfb-5097-46c5-933e-6d1dab18b815" name="Changes" comment="">
<change afterPath="$PROJECT_DIR$/src/com/engine/attendance/workflow/action/test/TestRunnable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.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/attendanceanalysis/cmd/getclockInpoint/MergeApairClockPoint.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/MergeApairClockPoint.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/MergeApairClockPoint.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/cmd/getclockInpoint/MergeApairClockPoint.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/service/impl/AttendanceSummaryServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/service/impl/AttendanceSummaryServiceImpl.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/test-classes/Test.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/Test.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/test/Test.java" beforeDir="false" afterPath="$PROJECT_DIR$/test/Test.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/commonutil/PersongroupCommonUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/commonutil/PersongroupCommonUtil.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/job/scheduling/tactics/DayRegularScheduling.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/job/scheduling/tactics/DayRegularScheduling.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/job/scheduling/tactics/MonthRegularScheduling.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/job/scheduling/tactics/MonthRegularScheduling.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/job/scheduling/tactics/WeekRegularScheduling.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/job/scheduling/tactics/WeekRegularScheduling.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/job/scheduling/tactics/YearRegularScheduling.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/job/scheduling/tactics/YearRegularScheduling.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/web/SchedulingResultsAction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/web/SchedulingResultsAction.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/common/util/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/common/util/Utils.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -64,7 +65,7 @@
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File" value="PLAIN_TEXT" />
<property name="last_directory_selection" value="$PROJECT_DIR$/src/com/engine/kq" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../上海考勤产品/考勤分支代码" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="nodejs_package_manager_path" value="npm" />
<property name="project.structure.last.edited" value="Artifacts" />
<property name="project.structure.proportion" value="0.15" />
@ -687,6 +688,13 @@
<workItem from="1719467422078" duration="18814000" />
<workItem from="1719540209233" duration="6565000" />
<workItem from="1719552784074" duration="10907000" />
<workItem from="1719639470676" duration="6100000" />
<workItem from="1719647614373" duration="8409000" />
<workItem from="1719662554646" duration="825000" />
<workItem from="1719757945342" duration="1933000" />
<workItem from="1719797909327" duration="5196000" />
<workItem from="1719812427959" duration="2488000" />
<workItem from="1719816602545" duration="2526000" />
</task>
<servers />
</component>
@ -752,7 +760,7 @@
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/commonutil/PersongroupCommonUtil.java</url>
<line>260</line>
<line>268</line>
<option name="timeStamp" value="172" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">

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

Binary file not shown.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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.

18
test/test/TestAction.java
Unescape Escape View File

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

31
test/test/TestRunnable.java
Unescape Escape View File

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