Kaynağa Gözat

fix bug:全部关系总览页点击手动计算时提示信息不正确的bug

lijie 3 yıl önce
ebeveyn
işleme
856fec3db0

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

@@ -723,13 +723,14 @@ public class RelationReportService implements IRelationReportService {
 		result.put("createTime", creationTime == null ? null : new DateTime(creationTime).toString());
 		result.put("mainObject", relationDefine.getFromObjType());
 		result.put("fromObject", relationDefine.getToObjType());
+		result.put("prompting", relationDefine.getPrompting());
 		// 空间分区
 		String zoneType = relationProject.has("zoneType") ? relationProject.get("zoneType").asText() : null;
 		if (StrUtil.isNotBlank(zoneType)){
 			SpaceTypeEnum spaceTypeEnum = EnumUtil.fromString(SpaceTypeEnum.class, zoneType);
 			if (null!=spaceTypeEnum){
 				result.put("zoneType",spaceTypeEnum.getCode());
-				result.put("note",spaceTypeEnum.getDesc());
+				result.put("note",relationDefine.getRemark());
 				result.put("relationTypeName",StrUtil.replace(result.getString("relationTypeName"),"业务空间",spaceTypeEnum.getDesc()));
 			}
 		}