bonus
/
Bonus-Cloud-Material-Mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

功能需求优化

This commit is contained in:
mashuai 2025-02-26 14:44:48 +08:00
parent 7cd842073e
commit 243465b36e
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java
View File

@ -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 -> {