diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CustomReportServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CustomReportServiceImpl.java index e129c0d..5a3ee93 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CustomReportServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CustomReportServiceImpl.java @@ -1,5 +1,6 @@ package com.njcn.csharmonic.service.impl; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.LocalDateTimeUtil; @@ -35,6 +36,7 @@ import com.njcn.csharmonic.utils.DataChangeUtil; import com.njcn.device.biz.commApi.CommTerminalGeneralClient; import com.njcn.device.biz.pojo.po.PqsDeviceUnit; import com.njcn.harmonic.common.mapper.ExcelRptTempMapper; +import com.njcn.harmonic.common.pojo.dto.DeviceUnitCommDTO; import com.njcn.harmonic.common.pojo.vo.ReportTemplateVO; import com.njcn.harmonic.common.service.CustomReportTableService; import com.njcn.harmonic.pojo.param.ReportSearchParam; @@ -163,7 +165,11 @@ public class CustomReportServiceImpl implements CustomReportService { //通用报表 Map map = csLineFeignClient.getCustomDetailByLineId(reportSearchParam.getLineId()).getData(); Map newMap = convertKeysToUpperCase(map); - customReportTableService.getCustomReport(reportSearchParam,newMap,response); + + PqsDeviceUnit deviceUnit = csCommTerminalFeignClient.lineUnitDetail(reportSearchParam.getLineId()).getData(); + DeviceUnitCommDTO deviceUnitCommDTO = BeanUtil.copyProperties(deviceUnit, DeviceUnitCommDTO.class); + + customReportTableService.getCustomReport(reportSearchParam,newMap,deviceUnitCommDTO,response); } else { //浙江无线报表 analyzeReportZhejiang(reportSearchParam, excelRptTemp, response);