zgty/zt-qms
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat:报告编制开发

Browse Source
This commit is contained in:
FCL
2025-10-16 17:28:05 +08:00
parent 1773769979
commit da2d97caf5
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentDataController.java
View File

@@ -48,6 +48,16 @@ public class ReportDocumentDataController extends AbstractFileUploadController i
@Resource @Resource
private ReportDocumentDataService reportDocumentDataService; private ReportDocumentDataService reportDocumentDataService;
@GetMapping("/queryAddedData")
@Operation(summary = "已编制报表数据查询")
@Parameter(name = "mianId", description = "报告数据id", required = true, example = "1024")
public CommonResult<List<ReportDocumentDataRespVO>> queryAddedData(@RequestParam("mianId") Long mianId) {
List<ReportDocumentDataDO> list = reportDocumentDataService.listByMainDataId(mianId).getData();
return success(BeanUtils.toBean(list, ReportDocumentDataRespVO.class));
}
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建检测报告明细") @Operation(summary = "创建检测报告明细")
@PreAuthorize("@ss.hasPermission('qms:report-document-data:create')") @PreAuthorize("@ss.hasPermission('qms:report-document-data:create')")

5
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentMainServiceImpl.java
View File

@@ -54,7 +54,7 @@ public class ReportDocumentMainServiceImpl implements ReportDocumentMainService
} }
} }
if(ObjectUtils.isEmpty(businessAssayReportDataIds) || addReportDataIdList.isEmpty()) if(ObjectUtils.isEmpty(businessAssayReportDataIds) || addReportDataIdList.isEmpty())
return error(REPORT_DOCUMENT_DATA_NOT_EXISTS, "缺少businessAssayReportDataIds参数，请刷新后重试"); return error(REPORT_DOCUMENT_DATA_NOT_EXISTS.getCode(), "缺少businessAssayReportDataIds参数，请刷新后重试");
List<ReportDocumentDataDO> savedDataList = reportDocumentDataService.listByMainDataId(id).getData(); List<ReportDocumentDataDO> savedDataList = reportDocumentDataService.listByMainDataId(id).getData();
List<Long> hasIds = savedDataList.stream().map(ReportDocumentDataDO::getSourceId).toList(); List<Long> hasIds = savedDataList.stream().map(ReportDocumentDataDO::getSourceId).toList();
boolean isExist = false; boolean isExist = false;
@@ -65,13 +65,14 @@ public class ReportDocumentMainServiceImpl implements ReportDocumentMainService
} }
} }
if(isExist) if(isExist)
return error(REPORT_DOCUMENT_DATA_NOT_EXISTS, "报表数据已在本报告使用，请勿重复添加"); return error(REPORT_DOCUMENT_DATA_NOT_EXISTS.getCode(), "报表数据已在本报告使用，请勿重复添加");
List<BusinessAssayReportDataDO> assayReportDataList = businessAssayReportDataService.listByIds(addReportDataIdList); List<BusinessAssayReportDataDO> assayReportDataList = businessAssayReportDataService.listByIds(addReportDataIdList);
List<ReportDocumentDataDO> insertList = new ArrayList<>(); List<ReportDocumentDataDO> insertList = new ArrayList<>();
for (BusinessAssayReportDataDO assayReportData : assayReportDataList) { for (BusinessAssayReportDataDO assayReportData : assayReportDataList) {
ReportDocumentDataDO reportDocumentDataDO = new ReportDocumentDataDO(); ReportDocumentDataDO reportDocumentDataDO = new ReportDocumentDataDO();
reportDocumentDataDO.setMainId(id); reportDocumentDataDO.setMainId(id);
reportDocumentDataDO.setSourceId(assayReportData.getId()); reportDocumentDataDO.setSourceId(assayReportData.getId());
reportDocumentDataDO.setDocumentContent(assayReportData.getAssayData());
insertList.add(reportDocumentDataDO); insertList.add(reportDocumentDataDO);
} }
if(!insertList.isEmpty()) if(!insertList.isEmpty())