Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
yangxiujun
/
paidan_demo
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 2fd37c17
authored
Nov 17, 2023
by
刘鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 工程师多工作队休息日判定错误
1 parent
3eb4730a
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletions
project-order/src/main/java/com/dituhui/pea/order/service/EngineerCalendarService.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerCalendarServiceImpl.java
project-order/src/main/java/com/dituhui/pea/order/service/EngineerCalendarService.java
View file @
2fd37c1
...
...
@@ -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
);
...
...
project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerCalendarServiceImpl.java
View file @
2fd37c1
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment