From cc63cead04a7e2eb2bed749d3c42e9ebecc19c0d Mon Sep 17 00:00:00 2001 From: cdf <857448963@qq.com> Date: Mon, 19 Jan 2026 11:29:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E9=99=8D=E7=9B=91=E6=B5=8B=E7=82=B9?= =?UTF-8?q?=E6=8A=A5=E5=91=8A=E6=8A=BD=E5=8F=96=E5=85=AC=E5=85=B1=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../csharmonic/service/impl/CustomReportServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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);