diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index c33192062..c91389679 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -4346,6 +4346,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl dbFieldExampleList = new LinkedList<>(); // 固定列 + int indexOfDescription = 1; // 参数名称的位置 for (int i = 0; i < fieldList.size(); i++) { OnlCgformField onlCgformField = fieldList.get(i); String dbFieldName = onlCgformField.getDbFieldName(); @@ -4356,6 +4357,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl dbFieldNameListCC = new LinkedList<>(); + List dbFieldListCC = new LinkedList<>(); + // 查询所有认证类别 + List sysDictItemList = sysDictItemService.selectItemsByDictCode("cert_category"); + if (CutEnum.EN.getValue().equals(cut)) { + sysDictItemList.forEach(sysDictItem -> { + dbFieldListCC.add(sysDictItem.getItemValue()); + dbFieldNameListCC.add(sysDictItem.getEnName() + " Number"); + }); + + } else { + sysDictItemList.forEach(sysDictItem -> { + dbFieldListCC.add(sysDictItem.getItemValue()); + dbFieldNameListCC.add(sysDictItem.getItemText() + "编号"); + }); + } + dbFieldList.addAll(dbFieldListCC); + dbFieldNameList.addAll(dbFieldNameListCC); + String[] title = new String[3]; String dbFieldStr = StringUtils.join(dbFieldList, ","); String dbFieldNameStr = StringUtils.join(dbFieldNameList, ","); @@ -4595,6 +4619,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl nioNumberList = dataList.stream().map(m -> (String) m.getNioNumber()).collect(Collectors.toList()); + List certCategoryParamsInfoPublishEOList = certCategoryParamsInfoPublishEOService.queryListByVersionAndNio(paramsTemplateId, paramsTemplatePublishVersion, nioNumberList); //查询所有认证类别参数项 + for (ParamsCollectManifestEO collectManifestEO : exportDataList) { Map record1 = objectToMapDre(collectManifestEO); String controlType = (String) record1.get("control_type"); @@ -4844,6 +4873,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl certCategoryParamsInfoPublishEOS = certCategoryParamsInfoPublishEOList.stream().filter(e -> nioNumber.equals(e.getNioNumber())).collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(certCategoryParamsInfoPublishEOS)) { + certCategoryParamsInfoPublishEOS.forEach(certCategoryParamsInfoPublishEO -> { + record1.put(certCategoryParamsInfoPublishEO.getCertCategory(), certCategoryParamsInfoPublishEO.getParamsNumber()); + }); + } + // 处理参考列,没引用过则不显示该列 if (StringUtils.isNotEmpty(paramsManifestEO.getReferencesColName()) && StringUtils.isNotEmpty(collectManifestEO.getReferencesCol())) { List referencesColList = Arrays.asList(collectManifestEO.getReferencesCol().split("#")); @@ -5480,6 +5517,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl list = paramsConfigDataEOList.stream().filter(e -> collectManifestMap.get(nioNumber).equals(e.getParamsCollectManifestId())