Commit 2fd37c17 by 刘鑫

fix: 工程师多工作队休息日判定错误

1 parent 3eb4730a
......@@ -58,14 +58,17 @@ public interface EngineerCalendarService {
* @param engineerCode 工程师编号
* @param targetDate 目标日期
* @return 是否是工作队内日期工作时间
* @apiNote 仅考虑工作队工作日期, 不考虑事件日程
*/
boolean engineerTeamDateWorkTime(String teamId, String engineerCode, LocalDate targetDate);
/**
* 判定工程师只顶你日期是否休息日
*
* @param engineerCode 工程师编号
* @param targetDate 目标日期
* @return 是否是工作日
* @apiNote 仅考虑工作队工作日期, 不考虑事件日程
*/
boolean engineerWorkDay(String engineerCode, LocalDate targetDate);
......
......@@ -628,7 +628,7 @@ public class EngineerCalendarServiceImpl implements EngineerCalendarService {
.distinct()
.collect(Collectors.toList());
final int dayOfWeek = targetDate.getDayOfWeek().getValue();
return ALL_WORK_DAY_OF_WEEK.contains(String.valueOf(dayOfWeek));
return teamCommonWorkdaysOfWeek.contains(String.valueOf(dayOfWeek));
}
@Override
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!