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 25b5858..bc4f9ee 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 @@ -48,6 +48,16 @@ public class ReportDocumentDataController extends AbstractFileUploadController i @Resource private ReportDocumentDataService reportDocumentDataService; + + @GetMapping("/queryAddedData") + @Operation(summary = "已编制报表数据查询") + @Parameter(name = "mianId", description = "报告数据id", required = true, example = "1024") + public CommonResult> queryAddedData(@RequestParam("mianId") Long mianId) { + List list = reportDocumentDataService.listByMainDataId(mianId).getData(); + return success(BeanUtils.toBean(list, ReportDocumentDataRespVO.class)); + } + + @PostMapping("/create") @Operation(summary = "创建检测报告明细") @PreAuthorize("@ss.hasPermission('qms:report-document-data:create')") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentMainServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentMainServiceImpl.java index f4892eb..ac4d83e 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentMainServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentMainServiceImpl.java @@ -54,7 +54,7 @@ public class ReportDocumentMainServiceImpl implements ReportDocumentMainService } } if(ObjectUtils.isEmpty(businessAssayReportDataIds) || addReportDataIdList.isEmpty()) - return error(REPORT_DOCUMENT_DATA_NOT_EXISTS, "缺少businessAssayReportDataIds参数,请刷新后重试"); + return error(REPORT_DOCUMENT_DATA_NOT_EXISTS.getCode(), "缺少businessAssayReportDataIds参数,请刷新后重试"); List savedDataList = reportDocumentDataService.listByMainDataId(id).getData(); List hasIds = savedDataList.stream().map(ReportDocumentDataDO::getSourceId).toList(); boolean isExist = false; @@ -65,13 +65,14 @@ public class ReportDocumentMainServiceImpl implements ReportDocumentMainService } } if(isExist) - return error(REPORT_DOCUMENT_DATA_NOT_EXISTS, "报表数据已在本报告使用,请勿重复添加"); + return error(REPORT_DOCUMENT_DATA_NOT_EXISTS.getCode(), "报表数据已在本报告使用,请勿重复添加"); List assayReportDataList = businessAssayReportDataService.listByIds(addReportDataIdList); List insertList = new ArrayList<>(); for (BusinessAssayReportDataDO assayReportData : assayReportDataList) { ReportDocumentDataDO reportDocumentDataDO = new ReportDocumentDataDO(); reportDocumentDataDO.setMainId(id); reportDocumentDataDO.setSourceId(assayReportData.getId()); + reportDocumentDataDO.setDocumentContent(assayReportData.getAssayData()); insertList.add(reportDocumentDataDO); } if(!insertList.isEmpty())