fix:报告数据报错修复；增加固定字段的数据方式

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentMainController.java

@@ -78,6 +78,7 @@ public class ReportDocumentMainController extends AbstractFileUploadController i
         if(typeDO == null){
             return error(REPORT_DOCUMENT_TYPE_NOT_EXISTS, "报告类型不存在，请刷新后重试");
         }
+        vo.setDocumentTitle(typeDO.getName());
         vo.setFlowKey(typeDO.getFlowKey());
         vo.setDocumentType(typeDO.getDocumentType());
         vo.setConfigReportTypeId(typeDO.getConfigReportTypeId());
@@ -244,8 +245,8 @@ public class ReportDocumentMainController extends AbstractFileUploadController i
     @Operation(summary = "获得检测报告业务分页")
     //@PreAuthorize("@ss.hasPermission('qms:report-document-main:query')")
     public CommonResult<PageResult<ReportDocumentMainRespVO>> getReportDocumentMainPage(@Valid ReportDocumentMainPageReqVO pageReqVO) {
-        PageResult<ReportDocumentMainDO> pageResult = reportDocumentMainService.getReportDocumentMainPage(pageReqVO);
+        PageResult<ReportDocumentMainRespVO> pageResult = reportDocumentMainService.getReportDocumentMainPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, ReportDocumentMainRespVO.class));
+        return success(pageResult);
     }
 
     @GetMapping("/export-excel")
@@ -255,10 +256,9 @@ public class ReportDocumentMainController extends AbstractFileUploadController i
     public void exportReportDocumentMainExcel(@Valid ReportDocumentMainPageReqVO pageReqVO,
                                               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<ReportDocumentMainDO> list = reportDocumentMainService.getReportDocumentMainPage(pageReqVO).getList();
+        List<ReportDocumentMainRespVO> list = reportDocumentMainService.getReportDocumentMainPage(pageReqVO).getList();
         // 导出 Excel
-        ExcelUtils.write(response, "检测报告业务.xls", "数据", ReportDocumentMainRespVO.class,
+        ExcelUtils.write(response, "检测报告业务.xls", "数据", ReportDocumentMainRespVO.class, list);
-                BeanUtils.toBean(list, ReportDocumentMainRespVO.class));
     }
 
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentMainRespVO.java

@@ -113,4 +113,10 @@ public class ReportDocumentMainRespVO {
     @Schema(description = "表单设计器模板id")
     @ExcelProperty("表单设计器模板id")
     private Long dataTemplateId;
+
+    //==============================扩展字段=======================================
+    @Schema(description = "记录数")
+    @ExcelProperty("记录数")
+    private Long detailDataCount;
+
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/dal/mapper/ReportDocumentMainMapper.java

@@ -3,7 +3,9 @@ package com.zt.plat.module.qms.business.reportdoc.dal.mapper;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
 import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.zt.plat.framework.mybatis.core.query.MPJLambdaWrapperX;
 import com.zt.plat.module.qms.business.reportdoc.controller.vo.*;
+import com.zt.plat.module.qms.business.reportdoc.dal.dataobject.ReportDocumentDataDO;
 import com.zt.plat.module.qms.business.reportdoc.dal.dataobject.ReportDocumentMainDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.util.ObjectUtils;
@@ -21,10 +23,13 @@ import java.util.List;
 public interface ReportDocumentMainMapper extends BaseMapperX<ReportDocumentMainDO> {
 
 
-    default PageResult<ReportDocumentMainDO> selectPage(ReportDocumentMainPageReqVO reqVO) {
+    default PageResult<ReportDocumentMainRespVO> selectPage(ReportDocumentMainPageReqVO reqVO) {
         String flowStatus = reqVO.getFlowStatus();
 
-        LambdaQueryWrapperX<ReportDocumentMainDO> wrapper = new LambdaQueryWrapperX<>();
+        MPJLambdaWrapperX<ReportDocumentMainDO> wrapper = new MPJLambdaWrapperX<>();
+        wrapper.selectSub(ReportDocumentDataDO.class, s->
+            s.selectCount(ReportDocumentDataDO::getMainId).eq(ReportDocumentDataDO::getMainId, ReportDocumentMainDO::getId), ReportDocumentMainRespVO::getDetailDataCount);
+        wrapper.selectAll(ReportDocumentMainDO.class);
         wrapper.ne(ReportDocumentMainDO::getCancelFlag, -1);    //-1为临时数据
         wrapper.eqIfPresent(ReportDocumentMainDO::getFlowInstanceId, reqVO.getFlowInstanceId());
         wrapper.eqIfPresent(ReportDocumentMainDO::getReportDocumentTypeId, reqVO.getReportDocumentTypeId());
@@ -49,7 +54,7 @@ public interface ReportDocumentMainMapper extends BaseMapperX<ReportDocumentMain
         wrapper.betweenIfPresent(ReportDocumentMainDO::getCreateTime, reqVO.getCreateTime());
         wrapper.eqIfPresent(ReportDocumentMainDO::getRemark, reqVO.getRemark());
         wrapper.orderByDesc(ReportDocumentMainDO::getId);
-        return selectPage(reqVO, wrapper);
+        return selectJoinPage(reqVO, ReportDocumentMainRespVO.class, wrapper);
     }
 
 }

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

@@ -22,6 +22,7 @@ public interface ReportDocumentDataService {
     CommonResult<List<JSONObject>> assembleDynamicData(ReportDocumentMainDO mainData, ReportDocumentTypeDO reportConfig);
 
     CommonResult<List<ReportDocumentDataDO>> listByMainDataId(Long mainDataId);
+    CommonResult<Long> countMainDataId(Long mainDataId);
     CommonResult<String> removeByMainIdAndDetailIds(Long mainDataId, List<Long> detailIds);
 
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentMainService.java

@@ -77,7 +77,7 @@ public interface ReportDocumentMainService {
      * @param pageReqVO 分页查询
      * @return 检测报告业务分页
      */
-    PageResult<ReportDocumentMainDO> getReportDocumentMainPage(ReportDocumentMainPageReqVO pageReqVO);
+    PageResult<ReportDocumentMainRespVO> getReportDocumentMainPage(ReportDocumentMainPageReqVO pageReqVO);
 
     //发起流程
     CommonResult<ReportDocumentMainRespVO> createProcessInstance(ReportDocumentMainSaveReqVO entity);

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

@@ -262,7 +262,7 @@ public class ReportDocumentMainServiceImpl implements ReportDocumentMainService,
     }
 
     @Override
-    public PageResult<ReportDocumentMainDO> getReportDocumentMainPage(ReportDocumentMainPageReqVO pageReqVO) {
+    public PageResult<ReportDocumentMainRespVO> getReportDocumentMainPage(ReportDocumentMainPageReqVO pageReqVO) {
         return reportDocumentMainMapper.selectPage(pageReqVO);
     }