diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java index a352bb4c..bf7d535c 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/datacenter/DataCenterRest.java @@ -237,8 +237,10 @@ public class DataCenterRest { } for (ShValueVo infoList : shValueVoList) { for (ProjectInfo info : projectInfoList) { - if(info.getNodeValue().equals(infoList.getName())){ - infoList.setValue(infoList.getValue().add(info.getUseLimitN())); + if(StringUtils.isNotBlank(info.getNodeValue())){ + if(info.getNodeValue().equals(infoList.getName())){ + infoList.setValue(infoList.getValue().add(info.getUseLimitN())); + } } } } @@ -380,6 +382,7 @@ public class DataCenterRest { map.put(PinYinUtils.getPinYinName(infoList.getNodeValue()),i.toString()); } List projectRecordVos=crmMapper.getPhaseFilesByEnterpriseSid(projectInfo.getEnterpriseSid()); +// projectRecordVos.stream().filter(s->ProjectRecordVo.get) map.put("list",projectRecordVos); return rb.success().setData(map); } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectInfo.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectInfo.java index 68854be4..bf95c6fd 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectInfo.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/ProjectInfo.java @@ -46,6 +46,8 @@ public class ProjectInfo { private BigDecimal useLimitN=new BigDecimal(0); @TableField(exist = false) private BigDecimal sumMoney=new BigDecimal(0); + @TableField(exist = false) private String type; + @TableField(exist = false) private String shSid; }