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 6111f450
authored
Jun 15, 2023
by
丁伟峰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
createTime ==> updateTime
1 parent
cb3e58e5
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
project-order/src/main/java/com/alibaba/cloud/integration/order/dto/CapacityStatQueryRespDTO.java
project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/CapacityQueryServiceImpl.java
project-order/src/main/java/com/alibaba/cloud/integration/order/dto/CapacityStatQueryRespDTO.java
View file @
6111f45
...
@@ -2,6 +2,7 @@ package com.alibaba.cloud.integration.order.dto;
...
@@ -2,6 +2,7 @@ package com.alibaba.cloud.integration.order.dto;
import
lombok.experimental.Accessors
;
import
lombok.experimental.Accessors
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
@lombok
.
Data
@lombok
.
Data
...
@@ -20,7 +21,7 @@ public class CapacityStatQueryRespDTO {
...
@@ -20,7 +21,7 @@ public class CapacityStatQueryRespDTO {
private
long
capAdjust
;
private
long
capAdjust
;
private
long
capTotal
;
private
long
capTotal
;
private
long
capUsed
;
private
long
capUsed
;
private
String
cre
ateTime
;
private
Date
upd
ateTime
;
private
String
date
;
private
String
date
;
private
long
engineerNum
;
private
long
engineerNum
;
private
String
groupName
;
private
String
groupName
;
...
...
project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/CapacityQueryServiceImpl.java
View file @
6111f45
...
@@ -104,14 +104,14 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
...
@@ -104,14 +104,14 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
OrgGroupEntity
g
=
orgGroupDao
.
getByGroupId
(
e
.
getOrgId
());
OrgGroupEntity
g
=
orgGroupDao
.
getByGroupId
(
e
.
getOrgId
());
content
.
setDate
(
e
.
getWorkday
()).
setLayer
(
e
.
getLayer
()).
setGroupName
(
g
.
getGroupName
())
content
.
setDate
(
e
.
getWorkday
()).
setLayer
(
e
.
getLayer
()).
setGroupName
(
g
.
getGroupName
())
.
setCapTotal
(
e
.
getCapTotal
()).
setCapUsed
(
e
.
getCapUsedTotal
())
.
setCapTotal
(
e
.
getCapTotal
()).
setCapUsed
(
e
.
getCapUsedTotal
())
.
setEngineerNum
(
e
.
getEngineerCount
()).
set
CreateTime
(
e
.
getCreateTime
().
toString
());
.
setEngineerNum
(
e
.
getEngineerCount
()).
set
UpdateTime
(
e
.
getUpdateTime
());
}
else
{
}
else
{
// group查询,是capacity_team_stat
// group查询,是capacity_team_stat
CapacityTeamStatEntity
e
=
(
CapacityTeamStatEntity
)
item
;
CapacityTeamStatEntity
e
=
(
CapacityTeamStatEntity
)
item
;
// capacity_team_stat表中的team_id,直接就是字符串
// capacity_team_stat表中的team_id,直接就是字符串
content
.
setDate
(
e
.
getWorkday
()).
setLayer
(
e
.
getLayer
()).
setTeamName
(
e
.
getTeamId
())
content
.
setDate
(
e
.
getWorkday
()).
setLayer
(
e
.
getLayer
()).
setTeamName
(
e
.
getTeamId
())
.
setCapTotal
(
e
.
getCapTotal
()).
setCapUsed
(
e
.
getCapUsed
()).
setCapAdjust
(
e
.
getCapAdjust
())
.
setCapTotal
(
e
.
getCapTotal
()).
setCapUsed
(
e
.
getCapUsed
()).
setCapAdjust
(
e
.
getCapAdjust
())
.
setEngineerNum
(
e
.
getEngineerCount
()).
set
CreateTime
(
e
.
getCreateTime
().
toString
());
.
setEngineerNum
(
e
.
getEngineerCount
()).
set
UpdateTime
(
e
.
getUpdateTime
());
}
}
contents
.
add
(
content
);
contents
.
add
(
content
);
}
}
...
...
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