From 309c958043e2015efc5ab6ede0ab614e0c8af1e3 Mon Sep 17 00:00:00 2001 From: FCL Date: Thu, 12 Mar 2026 16:41:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=B7=A5=E6=AE=B5=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E7=94=9F=E6=88=90=E6=8E=A5=E5=8F=A3-=E7=AD=BE=E5=90=8D?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/ReportDocumentDataController.java | 5 ++--- .../reportdoc/service/ReportDocumentDataService.java | 2 +- .../reportdoc/service/ReportDocumentDataServiceImpl.java | 8 +++++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentDataController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentDataController.java index 01debfcc..ccb7828d 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentDataController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentDataController.java @@ -67,9 +67,8 @@ public class ReportDocumentDataController extends AbstractFileUploadController i //@PreAuthorize("@ss.hasPermission('qms:report-document-data:create')") public CommonResult assembleByReportData(@RequestBody JSONObject jsonObject) { // Long mainId = jsonObject.getLong("mainId"); - List assayReportDataList = jsonObject.getJSONArray("assayReportDataList").toJavaList(BusinessAssayReportDataDO.class); - List itemNameList = jsonObject.getJSONArray("itemNameList").toJavaList(String.class); - return reportDocumentDataService.assembleByReportData(assayReportDataList, itemNameList); + + return reportDocumentDataService.assembleByReportData(jsonObject); } /* diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataService.java index 819b7bdc..a26d26f2 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataService.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataService.java @@ -22,7 +22,7 @@ public interface ReportDocumentDataService { CommonResult assembleDynamicData(ReportDocumentMainDO mainData, ReportDocumentTypeDO reportConfig, String pageFlag); - CommonResult assembleByReportData(List assayReportDataList, List itemNameList); + CommonResult assembleByReportData(JSONObject jsonObject); CommonResult> listByMainDataId(Long mainDataId); CommonResult countMainDataId(Long mainDataId); diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataServiceImpl.java index d14bc903..2e583a57 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataServiceImpl.java @@ -869,7 +869,10 @@ public class ReportDocumentDataServiceImpl implements ReportDocumentDataService * * */ @Override - public CommonResult assembleByReportData(List assayReportDataList, List itemNameList) { + public CommonResult assembleByReportData(JSONObject jsonObject) { + List assayReportDataList = jsonObject.getJSONArray("assayReportDataList").toJavaList(BusinessAssayReportDataDO.class); + List itemNameList = jsonObject.getJSONArray("itemNameList").toJavaList(String.class); + JSONObject signatureData = jsonObject.getJSONObject("signatureData"); if(assayReportDataList.isEmpty() || itemNameList.isEmpty()) return CommonResult.success(new JSONArray()); String pageFlag = "1"; @@ -887,8 +890,7 @@ public class ReportDocumentDataServiceImpl implements ReportDocumentDataService DictionaryBusinessRespVO dictConf = dictionaryBusinessService.getDataByDataKey("工段报告表单编辑模板参数").getData(); if(dictConf != null && !ObjectUtils.isEmpty(dictConf.getCustomConfig())) reportConfigStr = dictConf.getCustomConfig(); - ReportDocumentMainDO mainData = new ReportDocumentMainDO(); - mainData.builder().formData("").documentSignature("").documentConfig(""); + ReportDocumentMainDO mainData = new ReportDocumentMainDO().builder().formData("").documentSignature(signatureData.toJSONString()).documentConfig("").build(); JSONObject configJson = JSONObject.parseObject(reportConfigStr); String verticalFlag = configJson.getString("verticalFlag"); String maxRowCountStr = configJson.getString("maxRowCount"); //最大行数