|
@ -130,15 +130,6 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl<IcCustomerRepor |
|
|
ReportResultDTO dto = new ReportResultDTO(); |
|
|
ReportResultDTO dto = new ReportResultDTO(); |
|
|
dto.setReportId(r.getId()); |
|
|
dto.setReportId(r.getId()); |
|
|
dto.setReportName(r.getName()); |
|
|
dto.setReportName(r.getName()); |
|
|
JiMuResult<JimuReportDbDataResultDTO> reportDbDataResultDTOJiMuResult = jiMuReportOpenFeignClient.loadDbData(r.getId()); |
|
|
|
|
|
if (!reportDbDataResultDTOJiMuResult.isSuccess()){ |
|
|
|
|
|
throw new EpmetException("获取报表dbData失败:"+r.getId()); |
|
|
|
|
|
} |
|
|
|
|
|
log.info(JSON.toJSONString(reportDbDataResultDTOJiMuResult)); |
|
|
|
|
|
JimuReportDbDataResultDTO.ReportDB reportDb = reportDbDataResultDTOJiMuResult.getResult().getReportDb(); |
|
|
|
|
|
if (null != reportDb){ |
|
|
|
|
|
dto.setIsList(reportDb.getIsList().equals(NumConstant.ONE_STR)); |
|
|
|
|
|
} |
|
|
|
|
|
allReportList.add(dto); |
|
|
allReportList.add(dto); |
|
|
}); |
|
|
}); |
|
|
List<ReportResultDTO> reportList = baseDao.reportList(null, null); |
|
|
List<ReportResultDTO> reportList = baseDao.reportList(null, null); |
|
@ -254,6 +245,15 @@ public class IcCustomerReportServiceImpl extends BaseServiceImpl<IcCustomerRepor |
|
|
throw new EpmetException("获取jm报表详情失败:" + r); |
|
|
throw new EpmetException("获取jm报表详情失败:" + r); |
|
|
} |
|
|
} |
|
|
JiMuReportResultDTO data = ConvertUtils.mapToEntity(report.getResult(), JiMuReportResultDTO.class); |
|
|
JiMuReportResultDTO data = ConvertUtils.mapToEntity(report.getResult(), JiMuReportResultDTO.class); |
|
|
|
|
|
JiMuResult<JimuReportDbDataResultDTO> reportDbDataResultDTOJiMuResult = jiMuReportOpenFeignClient.loadDbData(r); |
|
|
|
|
|
if (!reportDbDataResultDTOJiMuResult.isSuccess()){ |
|
|
|
|
|
throw new EpmetException("获取报表dbData失败:"+r); |
|
|
|
|
|
} |
|
|
|
|
|
log.info(JSON.toJSONString(reportDbDataResultDTOJiMuResult)); |
|
|
|
|
|
JimuReportDbDataResultDTO.ReportDB reportDb = reportDbDataResultDTOJiMuResult.getResult().getReportDb(); |
|
|
|
|
|
if (null != reportDb){ |
|
|
|
|
|
data.setIsList(reportDb.getIsList().equals(NumConstant.ONE_STR)); |
|
|
|
|
|
} |
|
|
data.setReportId(data.getId()); |
|
|
data.setReportId(data.getId()); |
|
|
data.setReportName(data.getName()); |
|
|
data.setReportName(data.getName()); |
|
|
result.add(data); |
|
|
result.add(data); |
|
|