From 66f618dd5135001f150f99802b7ca6e0ff699bf4 Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 13 Jul 2022 17:45:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E4=B8=8A=E6=8A=A5=E5=BA=93-?= =?UTF-8?q?=E5=B8=B8=E8=A7=84=E5=AF=BC=E5=87=BA"=E6=A0=87=E9=A2=98"?= =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestEOServiceImpl.java | 5 +- .../mapper/xml/ParamsReportDetailEOMapper.xml | 1 + .../impl/ParamsReportDetailEOServiceImpl.java | 108 ++++++++++-------- 3 files changed, 64 insertions(+), 50 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 116df66f3..10ea4fc41 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -1550,6 +1550,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl nioNumberList = paramsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getNioNumber).collect(Collectors.toList()); // 单独添加 控件类型为标题的参数项 if (!isSync) { // 未上报 List paramsCollectManifestEOListOfTitle = paramsCollectManifestEOMapper.listInfoOfTitle(paramsManifestId); @@ -1564,10 +1565,12 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl nioNumberListOfTitle = paramsCollectManifestEOListOfTitle.stream().map(ParamsCollectManifestEO::getNioNumber).collect(Collectors.toList()); + nioNumberList.addAll(nioNumberListOfTitle); } // 复制认证类别参数 - List nioNumberList = paramsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getNioNumber).collect(Collectors.toList()); List certCategoryParamsInfoPublishEOS = certCategoryParamsInfoPublishEOService.queryListByVersionAndNio(paramsManifestEO.getParamsTemplateId(), paramsManifestEO.getParamsTemplatePublishVersion(), nioNumberList); for (CertCategoryParamsInfoPublishEO ccpi : certCategoryParamsInfoPublishEOS) { ReportCertCategoryParamsInfoEO addCcpi = new ReportCertCategoryParamsInfoEO(); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml index e73cb2970..06d76a401 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml @@ -105,6 +105,7 @@ prd.nio_number as nio_number, prd.params_name as params_name, prd.control_type as control_type, + prd.title_default_value as title_default_value, rccpi.params_number as cert_number, rccpi.params_name as cert_params_name from params_report_detail prd diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java index 52f87910b..1881e36a6 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java @@ -835,6 +835,8 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl record1 : dataList) { String paramsCollectManifestId = (String) record1.get("id"); + String controlType = (String) record1.get("control_type"); + String titleDefaultValue = (String) record1.get("title_default_value"); if (CollectionUtil.isNotEmpty(paramsConfigEOList)) { List fileList = new ArrayList<>(); @@ -843,70 +845,78 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImplconfigIdList.contains(e.getId())).collect(Collectors.toList()); // 过滤出要导出的配置列 paramsConfigEOList.forEach(paramsConfigEO -> { // 参数配置 - String paramsConfigId = paramsConfigEO.getId(); - ParamsReportConfigDataEO paramsConfigDataEO = paramsReportConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据 - StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据 - if (StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) { - configDataBuilder.append(paramsConfigDataEO.getTextData()).append("&"); - } - if (StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) { - configDataBuilder.append(paramsConfigDataEO.getPullData()).append("&"); - } - if (StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) { - List ossFileList = ossFileService.getFileInfosByConnectId(paramsConfigDataEO.getFileConnectId()); - if (CollectionUtil.isNotEmpty(ossFileList)) { - configDataBuilder.append(ossFileList.get(0).getFileName()).append("&"); - - fileList.addAll(ossFileList); + if (ControlTypeEnum.Title.getValue().equals(controlType)) { + record1.put(paramsConfigEO.getId(), titleDefaultValue); + } else { + String paramsConfigId = paramsConfigEO.getId(); + ParamsReportConfigDataEO paramsConfigDataEO = paramsReportConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据 + StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据 + if (StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) { + configDataBuilder.append(paramsConfigDataEO.getTextData()).append("&"); } - } + if (StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) { + configDataBuilder.append(paramsConfigDataEO.getPullData()).append("&"); + } + if (StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) { + List ossFileList = ossFileService.getFileInfosByConnectId(paramsConfigDataEO.getFileConnectId()); + if (CollectionUtil.isNotEmpty(ossFileList)) { + configDataBuilder.append(ossFileList.get(0).getFileName()).append("&"); - String configData = configDataBuilder.toString(); - if (configData.contains("&")) { - configData = configData.substring(0, configData.lastIndexOf("&")); - } + fileList.addAll(ossFileList); + } + } - record1.put(paramsConfigEO.getId(), configData); + String configData = configDataBuilder.toString(); + if (configData.contains("&")) { + configData = configData.substring(0, configData.lastIndexOf("&")); + } + + record1.put(paramsConfigEO.getId(), configData); + } }); } else if ("2".equals(paramsReportDetailVO.getCombineFlag())) { // 合并 String configData = ""; - List paramsReportConfigDataEOS = paramsReportConfigDataEOService.queryByConfigIdListAndCollectManifestId(configIdList, paramsCollectManifestId); + if (ControlTypeEnum.Title.getValue().equals(controlType)) { + record1.put("params_value", titleDefaultValue); + } else { + List paramsReportConfigDataEOS = paramsReportConfigDataEOService.queryByConfigIdListAndCollectManifestId(configIdList, paramsCollectManifestId); - String textDatas = paramsReportConfigDataEOS.stream().filter(e->StringUtils.isNotEmpty(e.getTextData())) - .map(ParamsReportConfigDataEO::getTextData).distinct().collect(Collectors.joining(paramsReportDetailVO.getSeparator())); + String textDatas = paramsReportConfigDataEOS.stream().filter(e -> StringUtils.isNotEmpty(e.getTextData())) + .map(ParamsReportConfigDataEO::getTextData).distinct().collect(Collectors.joining(paramsReportDetailVO.getSeparator())); - String pullDatas = paramsReportConfigDataEOS.stream().filter(e->StringUtils.isNotEmpty(e.getPullData())) - .map(ParamsReportConfigDataEO::getPullData).distinct().collect(Collectors.joining(paramsReportDetailVO.getSeparator())); + String pullDatas = paramsReportConfigDataEOS.stream().filter(e -> StringUtils.isNotEmpty(e.getPullData())) + .map(ParamsReportConfigDataEO::getPullData).distinct().collect(Collectors.joining(paramsReportDetailVO.getSeparator())); - List fileNameList = new ArrayList<>(); - paramsReportConfigDataEOS.forEach(paramsReportConfigDataEO -> { - if (StringUtils.isNotEmpty(paramsReportConfigDataEO.getFileConnectId())) { - List ossFileList = ossFileService.getFileInfosByConnectId(paramsReportConfigDataEO.getFileConnectId()); - if (CollectionUtil.isNotEmpty(ossFileList)) { - fileNameList.add(ossFileList.get(0).getFileName()); + List fileNameList = new ArrayList<>(); + paramsReportConfigDataEOS.forEach(paramsReportConfigDataEO -> { + if (StringUtils.isNotEmpty(paramsReportConfigDataEO.getFileConnectId())) { + List ossFileList = ossFileService.getFileInfosByConnectId(paramsReportConfigDataEO.getFileConnectId()); + if (CollectionUtil.isNotEmpty(ossFileList)) { + fileNameList.add(ossFileList.get(0).getFileName()); - fileList.addAll(ossFileList); + fileList.addAll(ossFileList); + } } + }); + + StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据 + if (StringUtils.isNotEmpty(textDatas)) { + configDataBuilder.append(textDatas).append("&"); } - }); + if (StringUtils.isNotEmpty(pullDatas)) { + configDataBuilder.append(pullDatas).append("&"); + } + if (CollectionUtil.isNotEmpty(fileNameList)) { + configDataBuilder.append(StringUtils.join(fileNameList, paramsReportDetailVO.getSeparator())).append("&"); + } + configData = configDataBuilder.toString(); + if (configData.contains("&")) { + configData = configData.substring(0, configData.lastIndexOf("&")); + } + record1.put("params_value", configData); - StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据 - if (StringUtils.isNotEmpty(textDatas)) { - configDataBuilder.append(textDatas).append("&"); } - if (StringUtils.isNotEmpty(pullDatas)) { - configDataBuilder.append(pullDatas).append("&"); - } - if (CollectionUtil.isNotEmpty(fileNameList)) { - configDataBuilder.append(StringUtils.join(fileNameList, ",")).append("&"); - } - configData = configDataBuilder.toString(); - if (configData.contains("&")) { - configData = configData.substring(0, configData.lastIndexOf("&")); - } - record1.put("params_value", configData); - } record1.put("fileList", fileList); }