diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java index a40ad6c..2d2f22b 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java @@ -409,11 +409,7 @@ public class DevInfoServiceImpl implements DevInfoService { fileInfoList.addAll(devInfo.getDetailsFileList()); } - /** - * 合格证与检测证明合二为一 - * 修改人:syruan - * 修改时间:2025/02/20 - * 描述:经沟通,田聪聪提出需求,检测证明与合格证合二为一 + // 合格证 if (CollectionUtil.isNotEmpty(devInfo.getTableList().get(i).getInsurancePdf())) { devInfo.getTableList().get(i).getInsurancePdf().removeIf(Objects::isNull); devInfo.getTableList().get(i).getInsurancePdf().forEach(item -> { @@ -421,7 +417,8 @@ public class DevInfoServiceImpl implements DevInfoService { item.setFileType(Long.valueOf(INSURANCE_PDF)); }); fileInfoList.addAll(devInfo.getTableList().get(i).getInsurancePdf()); - } */ + } + if (CollectionUtil.isNotEmpty(devInfo.getTableList().get(i).getExaminationPdf())) { devInfo.getTableList().get(i).getExaminationPdf().removeIf(Objects::isNull); devInfo.getTableList().get(i).getExaminationPdf().forEach(item -> { @@ -485,18 +482,17 @@ public class DevInfoServiceImpl implements DevInfoService { }); fileInfoList.addAll(devInfo.getDetailsFileList()); } - // 合格证与检测证明合二为一 // 修改人:syruan // 修改时间:2025/02/20 // 描述:经沟通,田聪聪提出需求,检测证明与合格证合二为一 -// if (CollectionUtil.isNotEmpty(table.getInsurancePdf())) { -// table.getInsurancePdf().removeIf(Objects::isNull); -// table.getInsurancePdf().forEach(item -> { -// item.setTaskType(MaterialConstants.MATERIAL_FILE_TYPE_CODE); -// item.setFileType(Long.valueOf(INSURANCE_PDF)); -// }); -// fileInfoList.addAll(table.getInsurancePdf()); -// } + if (CollectionUtil.isNotEmpty(table.getInsurancePdf())) { + table.getInsurancePdf().removeIf(Objects::isNull); + table.getInsurancePdf().forEach(item -> { + item.setTaskType(MaterialConstants.MATERIAL_FILE_TYPE_CODE); + item.setFileType(Long.valueOf(INSURANCE_PDF)); + }); + fileInfoList.addAll(table.getInsurancePdf()); + } if (CollectionUtil.isNotEmpty(table.getExaminationPdf())) { table.getExaminationPdf().removeIf(Objects::isNull); table.getExaminationPdf().forEach(item -> {