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 32b7820b
authored
Jul 08, 2023
by
丁伟峰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
工作队表增加了几个配置项;
1 parent
aba14081
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
7 deletions
project-order/src/main/java/com/dituhui/pea/order/entity/OrgTeamEntity.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/BusinessTeamServiceImpl.java
project-order/src/main/java/com/dituhui/pea/order/entity/OrgTeamEntity.java
View file @
32b7820
...
@@ -73,7 +73,17 @@ public class OrgTeamEntity {
...
@@ -73,7 +73,17 @@ public class OrgTeamEntity {
*/
*/
private
LocalDateTime
updateTime
;
private
LocalDateTime
updateTime
;
public
OrgTeamEntity
(){
private
String
workOn
;
private
String
workOff
;
private
Integer
workDuration
;
private
String
transportMode
;
private
String
strategySchedule
;
private
String
strategyAppointment
;
private
Integer
intervalSchedule
;
private
Integer
intervalScheduleNext
;
private
String
cuteOff
;
public
OrgTeamEntity
()
{
}
}
}
}
project-order/src/main/java/com/dituhui/pea/order/service/impl/BusinessTeamServiceImpl.java
View file @
32b7820
...
@@ -45,7 +45,7 @@ public class BusinessTeamServiceImpl implements BusinessTeamService {
...
@@ -45,7 +45,7 @@ public class BusinessTeamServiceImpl implements BusinessTeamService {
List
<
BusinessTeamsDTO
.
Content
>
contents
=
new
ArrayList
<>();
List
<
BusinessTeamsDTO
.
Content
>
contents
=
new
ArrayList
<>();
Pageable
pageable
=
PageRequest
.
of
(
req
.
getPage
()
-
1
,
req
.
getSize
());
Pageable
pageable
=
PageRequest
.
of
(
req
.
getPage
()
-
1
,
req
.
getSize
());
Page
<
OrgTeamEntity
>
page
=
null
;
Page
<
OrgTeamEntity
>
page
=
null
;
if
(
"branch"
.
equals
(
req
.
getLevelType
())){
if
(
"branch"
.
equals
(
req
.
getLevelType
()))
{
page
=
orgTeamDao
.
findAllByBranchId
(
req
.
getLevelValue
(),
pageable
);
page
=
orgTeamDao
.
findAllByBranchId
(
req
.
getLevelValue
(),
pageable
);
}
else
{
}
else
{
page
=
orgTeamDao
.
findAllByGroupId
(
req
.
getLevelValue
(),
pageable
);
page
=
orgTeamDao
.
findAllByGroupId
(
req
.
getLevelValue
(),
pageable
);
...
@@ -58,14 +58,15 @@ public class BusinessTeamServiceImpl implements BusinessTeamService {
...
@@ -58,14 +58,15 @@ public class BusinessTeamServiceImpl implements BusinessTeamService {
content
.
setTeamId
(
e
.
getTeamId
()).
setTeamName
(
e
.
getTeamName
());
content
.
setTeamId
(
e
.
getTeamId
()).
setTeamName
(
e
.
getTeamName
());
content
.
setWorkdays
(
String
.
join
(
"、"
,
getWorkdaysChinese
(
e
.
getWorkdays
())));
content
.
setWorkdays
(
String
.
join
(
"、"
,
getWorkdaysChinese
(
e
.
getWorkdays
())));
content
.
setEngineers
(
String
.
join
(
";"
,
engineers
));
content
.
setEngineers
(
String
.
join
(
";"
,
engineers
));
// todo 工作队容量
OrgWarehouseInfoEntity
warehouse
=
warehouseInfoDao
.
getByTeamAssigned
(
e
.
getTeamId
());
OrgWarehouseInfoEntity
warehouse
=
warehouseInfoDao
.
getByTeamAssigned
(
e
.
getTeamId
());
if
(
warehouse
!=
null
){
if
(
warehouse
!=
null
)
{
content
.
setWarehouseName
(
warehouse
.
getWarehouseName
());
content
.
setWarehouseName
(
warehouse
.
getWarehouseName
());
}
}
//capacityUse已占容量, capacityRest剩余容量
int
num
=
engineers
.
size
();
// ordersNum 当前单数
int
total
=
num
*
e
.
getWorkDuration
();
// pepleMinute 人数/分钟数
content
.
setPeopleMinute
(
String
.
format
(
"%s/%s"
,
num
,
total
));
// 容量
// 订单数
contents
.
add
(
content
);
contents
.
add
(
content
);
}
}
BusinessTeamsDTO
.
Result
rs
=
new
BusinessTeamsDTO
.
Result
();
BusinessTeamsDTO
.
Result
rs
=
new
BusinessTeamsDTO
.
Result
();
...
...
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