|
|
@@ -15,7 +15,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import jakarta.annotation.Resource;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
-import org.checkerframework.checker.units.qual.A;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
|
|
|
|
@@ -289,7 +288,7 @@ public class SopExecutionPlanServiceImpl extends ServiceImpl<SopExecutionPlanMap
|
|
|
return workDaysFromDays.stream().sorted().toList();
|
|
|
}
|
|
|
// 4.向后顺延
|
|
|
- if (nonWorkDay.equals(2) && nonWorkMoveDay != null && nonWorkMoveDay > 0) {
|
|
|
+ if (nonWorkDay.equals(3) && nonWorkMoveDay != null && nonWorkMoveDay > 0) {
|
|
|
Set<String> workDaysFromDays = new HashSet<>();
|
|
|
// 属于假日的日期
|
|
|
List<HolidayDO> holidayDOS = holidayService.list(Wrappers.<HolidayDO>lambdaQuery()
|
