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 40ed9bc5
authored
Jul 11, 2023
by
丁伟峰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
返回 group相关字段,前端需要使用
1 parent
363a2da2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
0 deletions
project-order/src/main/java/com/dituhui/pea/order/dto/BusinessTeamDetailDTO.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/BusinessTeamServiceImpl.java
project-order/src/main/java/com/dituhui/pea/order/dto/BusinessTeamDetailDTO.java
View file @
40ed9bc
...
@@ -19,6 +19,8 @@ public class BusinessTeamDetailDTO {
...
@@ -19,6 +19,8 @@ public class BusinessTeamDetailDTO {
private
ScheduleConfig
scheduleConfig
;
private
ScheduleConfig
scheduleConfig
;
private
String
teamId
;
private
String
teamId
;
private
String
teamName
;
private
String
teamName
;
private
String
groupId
;
private
String
groupName
;
private
String
warehouseId
;
private
String
warehouseId
;
private
List
<
String
>
workdays
;
private
List
<
String
>
workdays
;
}
}
...
...
project-order/src/main/java/com/dituhui/pea/order/service/impl/BusinessTeamServiceImpl.java
View file @
40ed9bc
...
@@ -227,8 +227,14 @@ public class BusinessTeamServiceImpl implements BusinessTeamService {
...
@@ -227,8 +227,14 @@ public class BusinessTeamServiceImpl implements BusinessTeamService {
Result
.
failed
(
String
.
format
(
"工作队[%s]不存在"
,
req
.
getTeamId
()));
Result
.
failed
(
String
.
format
(
"工作队[%s]不存在"
,
req
.
getTeamId
()));
}
}
BusinessTeamDetailDTO
.
Result
rs
=
new
BusinessTeamDetailDTO
.
Result
();
BusinessTeamDetailDTO
.
Result
rs
=
new
BusinessTeamDetailDTO
.
Result
();
OrgGroupEntity
g
=
orgGroupDao
.
getByGroupId
(
teamEntity
.
getGroupId
());
if
(
g
==
null
)
{
return
Result
.
failed
(
"数据配置错误,工作队没有对应的站点"
);
}
rs
.
setTeamId
(
teamEntity
.
getTeamId
())
rs
.
setTeamId
(
teamEntity
.
getTeamId
())
.
setTeamName
(
teamEntity
.
getTeamName
())
.
setTeamName
(
teamEntity
.
getTeamName
())
.
setGroupId
(
g
.
getGroupId
())
.
setGroupName
(
g
.
getGroupName
())
.
setWarehouseId
(
teamEntity
.
getWarehouseId
())
.
setWarehouseId
(
teamEntity
.
getWarehouseId
())
.
setWorkdays
(
Arrays
.
asList
(
teamEntity
.
getWorkdays
().
split
(
","
)));
.
setWorkdays
(
Arrays
.
asList
(
teamEntity
.
getWorkdays
().
split
(
","
)));
List
<
String
>
engineerCodes
=
orgTeamEngineerDao
.
findAllByTeamId
(
teamEntity
.
getTeamId
()).
stream
()
List
<
String
>
engineerCodes
=
orgTeamEngineerDao
.
findAllByTeamId
(
teamEntity
.
getTeamId
()).
stream
()
...
...
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