Skip to content

yangxiujun / paidan_demo

Go to a project
Commit 2ff72eac by 丁伟峰
Options

Merge branch 'develop-dingwf-0714' into develop

2 parents e862680b ccca1513
Inline Side-by-side
Showing with 17 additions and 6 deletions
project-order/src/main/java/com/dituhui/pea/order/dto/CapacityStatQueryDTO.java
...@@ -52,6 +52,7 @@ public class CapacityStatQueryDTO { ...@@ -52,6 +52,7 @@ public class CapacityStatQueryDTO {
private long capAdjust; private long capAdjust;
private long capTotal; private long capTotal;
private long capUsed; private long capUsed;
private long capLeft;
@JsonDeserialize(using = LocalDateTimeDeserializer.class) @JsonDeserialize(using = LocalDateTimeDeserializer.class)
@JsonSerialize(using = LocalDateTimeSerializer.class) @JsonSerialize(using = LocalDateTimeSerializer.class)
......
project-order/src/main/java/com/dituhui/pea/order/service/impl/OrgCapacityServiceImpl.java
...@@ -77,18 +77,28 @@ public class OrgCapacityServiceImpl implements OrgCapacityService { ...@@ -77,18 +77,28 @@ public class OrgCapacityServiceImpl implements OrgCapacityService {
CapacityOrgStatEntity e = (CapacityOrgStatEntity) item; CapacityOrgStatEntity e = (CapacityOrgStatEntity) item;
content.setLevelType(e.getType()).setLevelValue(e.getOrgId()); content.setLevelType(e.getType()).setLevelValue(e.getOrgId());
content.setShowName(names.get(e.getOrgId())); content.setShowName(names.get(e.getOrgId()));
content.setDate(e.getWorkday()).setLayer(e.getLayer()) content.setDate(e.getWorkday())
.setCapTotal(e.getCapTotal()).setCapUsed(e.getCapUsedTotal()) .setLayer(e.getLayer())
.setEngineerNum(e.getEngineerCount()).setUpdateTime(e.getUpdateTime()); .setCapTotal(e.getCapTotal())
.setCapUsed(e.getCapUsedTotal())
.setCapLeft(e.getCapLeft())
.setEngineerNum(e.getEngineerCount())
.setUpdateTime(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.setLevelType("team").setLevelValue(e.getTeamId()); content.setLevelType("team").setLevelValue(e.getTeamId());
content.setShowName(names.get(e.getTeamId())); content.setShowName(names.get(e.getTeamId()));
content.setDate(e.getWorkday()).setLayer(e.getLayer()).setShowName(e.getTeamId()) content.setDate(e.getWorkday())
.setCapTotal(e.getCapTotal()).setCapUsed(e.getCapUsed()).setCapAdjust(e.getCapAdjust()) .setLayer(e.getLayer())
.setEngineerNum(e.getEngineerCount()).setUpdateTime(e.getUpdateTime()); .setShowName(e.getTeamId())
.setCapTotal(e.getCapTotal())
.setCapUsed(e.getCapUsed())
.setCapLeft(e.getCapLeft())
.setCapAdjust(e.getCapAdjust())
.setEngineerNum(e.getEngineerCount())
.setUpdateTime(e.getUpdateTime());
} }
contents.add(content); contents.add(content);
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!