Commit 9d3cd0fd authored by fangxinjiang's avatar fangxinjiang

版本切换-fxj

parent bada5431
...@@ -902,11 +902,18 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -902,11 +902,18 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
//当月办次月生效 //当月办次月生效
if (CommonConstants.ONE_STRING.equals(innerVo.getAddHandleRule())){ if (CommonConstants.ONE_STRING.equals(innerVo.getAddHandleRule())){
if (canBeHandle){ if (canBeHandle){
Date today = new Date(); if (isBeforeThreshold){
preVo2.setExpectedCollectionTime(DateUtil.parseDate(DateUtil.dateToString( Date today = new Date();
today, DateUtil.ISO_EXPANDED_DATE_FORMAT) + collectionTimeFormat, DateUtil.DATETIME_PATTERN_MINUTE)); preVo2.setExpectedCollectionTime(DateUtil.parseDate(DateUtil.dateToString(
preVo2.setExpectedConfirmTime(DateUtil.parseDate(DateUtil.dateToString( today, DateUtil.ISO_EXPANDED_DATE_FORMAT) + collectionTimeFormat, DateUtil.DATETIME_PATTERN_MINUTE));
today, DateUtil.ISO_EXPANDED_DATE_FORMAT) + confirmTimeFormat, DateUtil.DATETIME_PATTERN_MINUTE)); preVo2.setExpectedConfirmTime(DateUtil.parseDate(DateUtil.dateToString(
today, DateUtil.ISO_EXPANDED_DATE_FORMAT) + confirmTimeFormat, DateUtil.DATETIME_PATTERN_MINUTE));
}else {
preVo2.setExpectedCollectionTime(DateUtil.parseDate(DateUtil.dateToString(
tomorrow, DateUtil.ISO_EXPANDED_DATE_FORMAT) + collectionTimeFormat, DateUtil.DATETIME_PATTERN_MINUTE));
preVo2.setExpectedConfirmTime(DateUtil.parseDate(DateUtil.dateToString(
tomorrow, DateUtil.ISO_EXPANDED_DATE_FORMAT) + confirmTimeFormat, DateUtil.DATETIME_PATTERN_MINUTE));
}
} else { } else {
preVo2.setExpectedCollectionTime(DateUtil.parseDate(DateUtil.dateToString( preVo2.setExpectedCollectionTime(DateUtil.parseDate(DateUtil.dateToString(
nextMonthFirstDay, DateUtil.ISO_EXPANDED_DATE_FORMAT) + collectionTimeFormat, DateUtil.DATETIME_PATTERN_MINUTE)); nextMonthFirstDay, DateUtil.ISO_EXPANDED_DATE_FORMAT) + collectionTimeFormat, DateUtil.DATETIME_PATTERN_MINUTE));
......
...@@ -1007,11 +1007,20 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap ...@@ -1007,11 +1007,20 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
//当月办次月生效 //当月办次月生效
if (CommonConstants.ONE_STRING.equals(innerVo.getAddHandleRule())){ if (CommonConstants.ONE_STRING.equals(innerVo.getAddHandleRule())){
if (canBeHandle){ if (canBeHandle){
Date today = new Date(); //发起时间不看工作日
preVo2.setExpectedCollectionTime(DateUtil.parseDate(DateUtil.dateToString( if (isBeforeThreshold) {
today, DateUtil.ISO_EXPANDED_DATE_FORMAT) + collectionTimeFormat, DateUtil.DATETIME_PATTERN_MINUTE)); Date today = new Date();
preVo2.setExpectedConfirmTime(DateUtil.parseDate(DateUtil.dateToString( preVo2.setExpectedCollectionTime(DateUtil.parseDate(DateUtil.dateToString(
today, DateUtil.ISO_EXPANDED_DATE_FORMAT) + confirmTimeFormat, DateUtil.DATETIME_PATTERN_MINUTE)); today, DateUtil.ISO_EXPANDED_DATE_FORMAT) + collectionTimeFormat, DateUtil.DATETIME_PATTERN_MINUTE));
preVo2.setExpectedConfirmTime(DateUtil.parseDate(DateUtil.dateToString(
today, DateUtil.ISO_EXPANDED_DATE_FORMAT) + confirmTimeFormat, DateUtil.DATETIME_PATTERN_MINUTE));
}else {
preVo2.setExpectedCollectionTime(DateUtil.parseDate(DateUtil.dateToString(
tomorrow, DateUtil.ISO_EXPANDED_DATE_FORMAT) + collectionTimeFormat, DateUtil.DATETIME_PATTERN_MINUTE));
preVo2.setExpectedConfirmTime(DateUtil.parseDate(DateUtil.dateToString(
tomorrow, DateUtil.ISO_EXPANDED_DATE_FORMAT) + confirmTimeFormat, DateUtil.DATETIME_PATTERN_MINUTE));
}
} else { } else {
preVo2.setExpectedCollectionTime(DateUtil.parseDate(DateUtil.dateToString( preVo2.setExpectedCollectionTime(DateUtil.parseDate(DateUtil.dateToString(
nextMonthFirstDay, DateUtil.ISO_EXPANDED_DATE_FORMAT) + collectionTimeFormat, DateUtil.DATETIME_PATTERN_MINUTE)); nextMonthFirstDay, DateUtil.ISO_EXPANDED_DATE_FORMAT) + collectionTimeFormat, DateUtil.DATETIME_PATTERN_MINUTE));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment