From b7b520bfe8b35683112284861f0dca8e645cbd56 Mon Sep 17 00:00:00 2001 From: riku <risaku@163.com> Date: 星期二, 31 十二月 2024 10:22:40 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/hc-satellite-data-import-1227_2' --- src/main/kotlin/com/flightfeather/uav/biz/report/MissionReport.kt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/com/flightfeather/uav/biz/report/MissionReport.kt b/src/main/kotlin/com/flightfeather/uav/biz/report/MissionReport.kt index 62bbcf6..a2c474d 100644 --- a/src/main/kotlin/com/flightfeather/uav/biz/report/MissionReport.kt +++ b/src/main/kotlin/com/flightfeather/uav/biz/report/MissionReport.kt @@ -149,12 +149,12 @@ // 4. 鐢熸垚鎶ュ憡 val fileName = "report/" + "${mission.districtName}璧拌埅鐩戞祴鎶ュ憡-${ DateUtil.instance.dateToString(mission.startTime, DateUtil.DateStyle.YYYY_MM_DD) - }.doc" + }(${mission.missionCode}).doc" val reportTemplate = ReportTemplate(templateName, filePath, fileName) val param = getParam(mission, exceptions, summaries) val params = reportTemplate.getParam(param) GeneratePdfUtil.generateWord(params) - return fileName + return filePath + fileName } private fun getParam(mission: Mission, exceptions: List<ExceptionResult>, summaries: List<Summary>): Param { -- Gitblit v1.9.3