Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Valerio Castellana
2024-10-02 14:56:59 +02:00
parent 4335c1b0f7 0e64ff7c05
commit 74e356f3bb
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ems-core/src/main/java/it/integry/ems/dto/CreateZipDTO.java
View File

@@ -3,6 +3,7 @@ package it.integry.ems.dto;
import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonValue;
import it.integry.ems.report.dto.JasperDTO; import it.integry.ems.report.dto.JasperDTO;
import it.integry.ems_model.base.EntityBase; import it.integry.ems_model.base.EntityBase;
import it.integry.ems_model.entity.DtbDocPdf;
import it.integry.ems_model.entity.MtbAartLink; import it.integry.ems_model.entity.MtbAartLink;
import it.integry.ems_model.entity.MtbUntMis; import it.integry.ems_model.entity.MtbUntMis;
import it.integry.ems_model.entity.StbActivityFile; import it.integry.ems_model.entity.StbActivityFile;
@@ -18,6 +19,8 @@ public class CreateZipDTO {
private List<MtbAartLink> listMtbAartLink; private List<MtbAartLink> listMtbAartLink;
private List<DtbDocPdf> listDtbDocPdf;
private String fileName; private String fileName;
private SaveMode saveMode = SaveMode.STB_FILES_ATTACHED; private SaveMode saveMode = SaveMode.STB_FILES_ATTACHED;
@@ -51,6 +54,15 @@ public class CreateZipDTO {
return this; return this;
} }
public List<DtbDocPdf> getListDtbDocPdf() {
return listDtbDocPdf;
}
public CreateZipDTO setListDtbDocPdf(List<DtbDocPdf> listDtbDocPdf) {
this.listDtbDocPdf = listDtbDocPdf;
return this;
}
public String getFileName() { public String getFileName() {
return fileName; return fileName;
} }

16
ems-core/src/main/java/it/integry/ems/service/EmsServices.java
View File

@@ -685,6 +685,22 @@ public class EmsServices {
} }
} }
if (!UtilityList.isNullOrEmpty(createZipDTO.getListDtbDocPdf())){
List<DtbDocPdf> listDtbDocPdf = createZipDTO.getListDtbDocPdf().stream()
.peek(dtbDocPdf -> dtbDocPdf.setOperation(OperationType.SELECT_OBJECT))
.collect(Collectors.toList());
List<EntityBase> entityBases = Collections.unmodifiableList(entityProcessor.processEntityList(listDtbDocPdf, true));
UtilityEntity.throwEntitiesException(entityBases);
listDtbDocPdf = UtilityEntity.toCustomEntity(entityBases);
for (DtbDocPdf dtbDocPdf : listDtbDocPdf) {
UtilityZip.addFileToArchive(zos, dtbDocPdf.getFilename(), Base64.decodeBase64(dtbDocPdf.getFilecontentByteArr(false)));
}
}
if (baos.size() > 0) { if (baos.size() > 0) {
zos.close(); zos.close();