Skip to content

yangxiujun / paidan_demo

Go to a project
Commit 7087cfaf by 刘鑫
Options

fix: 日历时间窗计算除当天以外时间差值错误

1 parent 7c4c01e1
Inline Side-by-side
Showing with 2 additions and 2 deletions
project-dispatch/src/main/java/com/dituhui/pea/dispatch/service/impl/EngineerCalendarServiceImpl.java
...@@ -592,7 +592,7 @@ public class EngineerCalendarServiceImpl implements EngineerCalendarService { ...@@ -592,7 +592,7 @@ public class EngineerCalendarServiceImpl implements EngineerCalendarService {
LocalDateTime workStartTime = DateUtils.localDateTimeFromStr(String.format("%s %s:00", targetDate, businessEntity.getWorkOn())); LocalDateTime workStartTime = DateUtils.localDateTimeFromStr(String.format("%s %s:00", targetDate, businessEntity.getWorkOn()));
LocalDateTime workEndTime = DateUtils.localDateTimeFromStr(String.format("%s %s:00", targetDate, businessEntity.getWorkOff())); LocalDateTime workEndTime = DateUtils.localDateTimeFromStr(String.format("%s %s:00", targetDate, businessEntity.getWorkOff()));
final LocalDateTime minDate = LocalDateTime.of(LocalDate.now(), LocalTime.MIN); final LocalDateTime minDate = LocalDateTime.of(targetDate, LocalTime.MIN);
List<OccupyInfoDetail> configs = getEngineerWorkDayCalendar(engineerCode, targetDate); List<OccupyInfoDetail> configs = getEngineerWorkDayCalendar(engineerCode, targetDate);
if (CollectionUtils.isEmpty(configs)) { if (CollectionUtils.isEmpty(configs)) {
......
project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerCalendarServiceImpl.java
...@@ -629,7 +629,7 @@ public class EngineerCalendarServiceImpl implements EngineerCalendarService { ...@@ -629,7 +629,7 @@ public class EngineerCalendarServiceImpl implements EngineerCalendarService {
LocalDateTime workStartTime = DateUtils.localDateTimeFromStr(String.format("%s %s:00", targetDate, businessEntity.getWorkOn())); LocalDateTime workStartTime = DateUtils.localDateTimeFromStr(String.format("%s %s:00", targetDate, businessEntity.getWorkOn()));
LocalDateTime workEndTime = DateUtils.localDateTimeFromStr(String.format("%s %s:00", targetDate, businessEntity.getWorkOff())); LocalDateTime workEndTime = DateUtils.localDateTimeFromStr(String.format("%s %s:00", targetDate, businessEntity.getWorkOff()));
final LocalDateTime minDate = LocalDateTime.of(LocalDate.now(), LocalTime.MIN); final LocalDateTime minDate = LocalDateTime.of(targetDate, LocalTime.MIN);
List<OccupyInfoDetail> configs = getEngineerWorkDayCalendar(engineerCode, targetDate); List<OccupyInfoDetail> configs = getEngineerWorkDayCalendar(engineerCode, targetDate);
if (CollectionUtils.isEmpty(configs)) { if (CollectionUtils.isEmpty(configs)) {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!