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

gestire ordinamento in cambio tipo documento

Browse Source
This commit is contained in:
Mina Ruggiero
2024-01-05 14:25:56 +01:00
parent 30b589f933
commit 3cf81fe1ac
2 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
ems-engine/src/main/java/it/integry/ems/document/dto/CambioTipoDocDTO.java
View File

@@ -5,18 +5,18 @@ import java.util.List;
import java.util.Objects;
public class CambioTipoDocDTO {
String codAnag;
String codDtip;
Date dataDoc;
String serDoc;
Integer numDoc;
Date dataCmov;
String numDocForn;
String codDtipNew;
String userName;
String fullName;
List<Allegati> allegati;
private String codAnag;
private String codDtip;
private Date dataDoc;
private String serDoc;
private Integer numDoc;
private Date dataCmov;
private String numDocForn;
private String codDtipNew;
private String userName;
private String fullName;
private Integer ordinamento;
private List<Allegati> allegati;
public String getCodAnag() {
return codAnag;
@@ -117,6 +117,15 @@ public class CambioTipoDocDTO {
return this;
}
public Integer getOrdinamento() {
return ordinamento;
}
public CambioTipoDocDTO setOrdinamento(Integer ordinamento) {
this.ordinamento = ordinamento;
return this;
}
public static class Allegati {
String idAllegato;
@@ -128,6 +137,7 @@ public class CambioTipoDocDTO {
this.idAllegato = idAllegato;
return this;
}
}
@Override

11
ems-engine/src/main/java/it/integry/ems/document/service/CambioTipoDocPlanService.java
View File

@@ -65,9 +65,9 @@ public class CambioTipoDocPlanService {
String sql =
"SELECT * FROM (" +
"SELECT *, dense_rank() over (order by data_cmov, cod_anag, cod_dtip, data_doc, ser_doc, num_doc) doc \n" +
"SELECT *, dense_rank() over (order by data_cmov, cod_anag, data_doc, ser_doc, num_doc, cod_dtip) ordinamento \n" +
"FROM dtb_doct_cambio_tipo_doc) t \n" +
(!UtilityString.isNullOrEmpty(topDoc) ? " WHERE doc <= " + topDoc : "");
(!UtilityString.isNullOrEmpty(topDoc) ? " WHERE ordinamento <= " + topDoc : "");
List<DtbDoctCambioTipoDoc> dtbDoctCambioTipoDocs = UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(), sql, DtbDoctCambioTipoDoc.class);
if (dtbDoctCambioTipoDocs == null) {
@@ -99,11 +99,8 @@ public class CambioTipoDocPlanService {
.setDataCmov(x.getDataCmov())
.setCodDtipNew(x.getCodDtipNew())
.setUserName(x.getUserName())
).sorted((o1, o2) -> {
String key1 = o1.getKey().getCodAnag() + String.format("0000000000", o1.getKey().getNumDoc());
String key2 = o2.getKey().getCodAnag() + String.format("0000000000", o2.getKey().getNumDoc());
return key1.compareTo(key2);
}).toList();
.setOrdinamento(x.getOrdinamento())
).sorted(Comparator.comparing(o -> o.getKey().getOrdinamento())).toList();
for (Map.Entry<CambioTipoDocDTO, List<DtbDoctCambioTipoDoc>> doc : list) {
List<EntityBase> entityList;