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

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
禁止呵呵
2025-12-09 16:10:46 +08:00
parent 2790ed7ea1 9f4369bcb2
commit 8fd750a82f
3 changed files with 131 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,16 +62,12 @@ public class ReportDocumentDataController extends AbstractFileUploadController i
@GetMapping("/queryReportDetail") @GetMapping("/queryReportDetail")
@Operation(summary = "查询报告明细数据") @Operation(summary = "查询报告明细数据")
@Parameter(name = "mainId", description = "报告id", required = true, example = "1024") @Parameter(name = "mainId", description = "报告id", required = true, example = "1024")
public CommonResult<List<JSONObject>> queryReportDetail(@RequestParam("mainId") Long mainId) { public CommonResult<?> queryReportDetail(@RequestParam("mainId") Long mainId, @RequestParam(name = "pageFlag", required = false) String pageFlag) {
ReportDocumentMainDO mainDO = reportDocumentMainService.getReportDocumentMain(mainId); ReportDocumentMainDO mainDO = reportDocumentMainService.getReportDocumentMain(mainId);
Long typeId = mainDO.getReportDocumentTypeId(); Long typeId = mainDO.getReportDocumentTypeId();
ReportDocumentTypeDO typeDO = reportDocumentTypeService.getReportDocumentType(typeId); ReportDocumentTypeDO typeDO = reportDocumentTypeService.getReportDocumentType(typeId);
Long confId = typeDO.getConfigReportTypeId(); CommonResult<JSONArray> result = reportDocumentDataService.assembleDynamicData(mainDO, typeDO, pageFlag);
// Map<String, Object> param = new HashMap<>();
// List<ReportDocumentDataDO> list = reportDocumentDataService.listByMainDataId(mainId).getData();
// return success(BeanUtils.toBean(list, ReportDocumentDataRespVO.class));
CommonResult<List<JSONObject>> result = reportDocumentDataService.assembleDynamicData(mainDO, typeDO);
return result; return result;
} }

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

@@ -19,7 +19,7 @@ import java.util.List;
*/ */
public interface ReportDocumentDataService { public interface ReportDocumentDataService {
CommonResult<List<JSONObject>> assembleDynamicData(ReportDocumentMainDO mainData, ReportDocumentTypeDO reportConfig); CommonResult<JSONArray> assembleDynamicData(ReportDocumentMainDO mainData, ReportDocumentTypeDO reportConfig, String pageFlag);
CommonResult<List<ReportDocumentDataDO>> listByMainDataId(Long mainDataId); CommonResult<List<ReportDocumentDataDO>> listByMainDataId(Long mainDataId);
CommonResult<Long> countMainDataId(Long mainDataId); CommonResult<Long> countMainDataId(Long mainDataId);

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

File diff suppressed because it is too large Load Diff