Commit 01643a65 authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/MVP1.7.17' into MVP1.7.17

parents 12f33d9e f73a69ed
...@@ -554,8 +554,10 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -554,8 +554,10 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
// 获取下一个工作日 // 获取下一个工作日
public LocalDate getNextWorkday(LocalDate date, Map<String, Integer> holidayMap) { public LocalDate getNextWorkday(LocalDate date, Map<String, Integer> holidayMap) {
LocalDate result = date.plusDays(CommonConstants.ONE_INT); LocalDate result = date.plusDays(CommonConstants.ONE_INT);
while (!this.isWorkday(date, holidayMap)) { int i=100;
while (i>0 && !this.isWorkday(result, holidayMap)) {
result = result.plusDays(CommonConstants.ONE_INT); result = result.plusDays(CommonConstants.ONE_INT);
i--;
} }
return result; return result;
} }
...@@ -1074,7 +1076,7 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -1074,7 +1076,7 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
EmployeeRegistrationLeaveLog leaveLog; EmployeeRegistrationLeaveLog leaveLog;
String preContent = "立即发起全部日期的事项:"; String preContent = "立即发起全部日期的事项:";
if (Common.isNotNull(isExit) && isExit.equals(CommonConstants.ONE_STRING)) { if (Common.isNotNull(isExit) && isExit.equals(CommonConstants.ONE_STRING)) {
preContent += "立即发起今日及之前的事项:"; preContent = "立即发起今日及之前的事项:";
} }
StringBuilder logSubType; StringBuilder logSubType;
for (EmployeeRegistrationLeave leave : leaveList) { for (EmployeeRegistrationLeave leave : leaveList) {
......
...@@ -416,7 +416,7 @@ public class TInsuranceWarnServiceImpl extends ServiceImpl<TInsuranceWarnMapper, ...@@ -416,7 +416,7 @@ public class TInsuranceWarnServiceImpl extends ServiceImpl<TInsuranceWarnMapper,
// 获取下一个工作日 // 获取下一个工作日
public LocalDate getNextWorkday(LocalDate date, Map<String, Integer> holidayMap) { public LocalDate getNextWorkday(LocalDate date, Map<String, Integer> holidayMap) {
LocalDate result = date.plusDays(CommonConstants.ONE_INT); LocalDate result = date.plusDays(CommonConstants.ONE_INT);
while (!this.isWorkday(date, holidayMap)) { while (!this.isWorkday(result, holidayMap)) {
result = result.plusDays(CommonConstants.ONE_INT); result = result.plusDays(CommonConstants.ONE_INT);
} }
return result; return result;
......
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