Commit 09dbc25a by 丁伟峰

group类型,才添加groupName

1 parent d903c0aa
...@@ -101,11 +101,11 @@ public class CapacityQueryServiceImpl implements CapacityQueryService { ...@@ -101,11 +101,11 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
if (item instanceof CapacityOrgStatEntity) { if (item instanceof CapacityOrgStatEntity) {
// cluster/branch查询,都是capacity_org_stat // cluster/branch查询,都是capacity_org_stat
CapacityOrgStatEntity e = (CapacityOrgStatEntity) item; CapacityOrgStatEntity e = (CapacityOrgStatEntity) item;
if ("group".equals(e.getType())) {
OrgGroupEntity g = orgGroupDao.getByGroupId(e.getOrgId()); OrgGroupEntity g = orgGroupDao.getByGroupId(e.getOrgId());
if (g == null) { content.setGroupName(g.getGroupName());
log.warn("orgId: {} ===> null", e.getOrgId());
} }
content.setDate(e.getWorkday()).setLayer(e.getLayer()).setGroupName(g.getGroupName()) content.setDate(e.getWorkday()).setLayer(e.getLayer())
.setCapTotal(e.getCapTotal()).setCapUsed(e.getCapUsedTotal()) .setCapTotal(e.getCapTotal()).setCapUsed(e.getCapUsedTotal())
.setEngineerNum(e.getEngineerCount()).setUpdateTime(e.getUpdateTime()); .setEngineerNum(e.getEngineerCount()).setUpdateTime(e.getUpdateTime());
} else { } else {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!