|
@@ -733,7 +733,7 @@ public class RelationReportService implements IRelationReportService {
|
|
Map<String, JSONObject> typeMap = new HashMap<>();
|
|
Map<String, JSONObject> typeMap = new HashMap<>();
|
|
Map<String, Map<String, JSONObject>> graphMap = new HashMap<>();
|
|
Map<String, Map<String, JSONObject>> graphMap = new HashMap<>();
|
|
Map<String, Map<String, JSONObject>> relMap = new HashMap<>();
|
|
Map<String, Map<String, JSONObject>> relMap = new HashMap<>();
|
|
-// Map<String, AdmRelationTypeEnum> graphRelTypeMap = AdmRelationTypeEnum.getGraphRelTypeMap();
|
|
|
|
|
|
+ Map<String, AdmRelationTypeEnum> graphRelTypeMap = AdmRelationTypeEnum.getGraphRelTypeMap();
|
|
Map<String, Integer> relCountMap = queryAllRelationCountMap(groupCode,projectId);
|
|
Map<String, Integer> relCountMap = queryAllRelationCountMap(groupCode,projectId);
|
|
// 按关系计算数据循环
|
|
// 按关系计算数据循环
|
|
for (ObjectNode projectRel : projectRelList) {
|
|
for (ObjectNode projectRel : projectRelList) {
|
|
@@ -766,7 +766,7 @@ public class RelationReportService implements IRelationReportService {
|
|
// 构建边
|
|
// 构建边
|
|
Map<String, JSONObject> rels = relMap.get(graphCode);
|
|
Map<String, JSONObject> rels = relMap.get(graphCode);
|
|
if(!rels.containsKey(relCode)) {
|
|
if(!rels.containsKey(relCode)) {
|
|
- rels.put(relCode, fillRelationProjectCal(projectRel, graphCode, relCode, null, relationDefineMap, relCountMap));
|
|
|
|
|
|
+ rels.put(relCode, fillRelationProjectCal(projectRel, graphCode, relCode, graphRelTypeMap, relationDefineMap, relCountMap));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if(MapUtil.isEmpty(relMap)) {
|
|
if(MapUtil.isEmpty(relMap)) {
|