فهرست منبع

【ADM-web】无法交付生活给水关系

yucheng 3 سال پیش
والد
کامیت
497294108e
1فایلهای تغییر یافته به همراه2 افزوده شده و 2 حذف شده
  1. 2 2
      src/main/java/com/persagy/proxy/report/service/impl/RelationReportService.java

+ 2 - 2
src/main/java/com/persagy/proxy/report/service/impl/RelationReportService.java

@@ -733,7 +733,7 @@ public class RelationReportService implements IRelationReportService {
 		Map<String, JSONObject> typeMap = new HashMap<>();
 		Map<String, Map<String, JSONObject>> graphMap = 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);
 		// 按关系计算数据循环
 		for (ObjectNode projectRel : projectRelList) {
@@ -766,7 +766,7 @@ public class RelationReportService implements IRelationReportService {
 			// 构建边
 			Map<String, JSONObject> rels = relMap.get(graphCode);
 			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)) {