Merge branch 'develop' into feature/JDK11
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
This commit is contained in:
@@ -11,6 +11,7 @@ import it.integry.ems_model.entity.DtbDoct;
|
||||
import it.integry.ems_model.entity.DtbDoctCambioTipoDoc;
|
||||
import it.integry.ems_model.service.SetupGest;
|
||||
import it.integry.ems_model.types.OperationType;
|
||||
import it.integry.ems_model.utility.UtilityDate;
|
||||
import it.integry.ems_model.utility.UtilityString;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.context.annotation.Scope;
|
||||
@@ -35,6 +36,7 @@ public class CambioTipoDocService {
|
||||
private SetupGest setupGest;
|
||||
@Autowired
|
||||
private RequestDataDTO requestDataDTO;
|
||||
|
||||
public List<EntityBase> cambioTipoDoc(String codDtip, List<CambioTipoDocDTO> documenti) throws Exception {
|
||||
List<EntityBase> entityList = new ArrayList<>();
|
||||
final String gestName = "W_ACAMBIO_COD_DTIP_DISP";
|
||||
@@ -46,8 +48,8 @@ public class CambioTipoDocService {
|
||||
if (UtilityString.isNullOrEmpty(emailForLog))
|
||||
throw new Exception(String.format("Email a cui inviare il log non configurata -> %s ->%s -> EMAIL_FOR_LOG", gestName, section));
|
||||
|
||||
if ( pianifica ) {
|
||||
for (CambioTipoDocDTO c: documenti ){
|
||||
if (pianifica) {
|
||||
for (CambioTipoDocDTO c : documenti) {
|
||||
DtbDoctCambioTipoDoc dtbDoctCambioTipoDoc =
|
||||
new DtbDoctCambioTipoDoc()
|
||||
.setCodAnag(c.getCodAnag())
|
||||
@@ -65,7 +67,7 @@ public class CambioTipoDocService {
|
||||
|
||||
if (c.getAllegati() != null && !c.getAllegati().isEmpty()) {
|
||||
for (CambioTipoDocDTO.Allegati a : c.getAllegati()) {
|
||||
if ( dtbDoctCambioTipoDoc.getIdAllegato() == null ) {
|
||||
if (dtbDoctCambioTipoDoc.getIdAllegato() == null) {
|
||||
dtbDoctCambioTipoDoc.setIdAllegato(a.getIdAllegato());
|
||||
entityList.add(dtbDoctCambioTipoDoc);
|
||||
} else {
|
||||
@@ -107,13 +109,19 @@ public class CambioTipoDocService {
|
||||
newDoc.setOperation(OperationType.SELECT_OBJECT);
|
||||
newDoc = entityProcessor.processEntity(newDoc, multiDBTransactionManager);
|
||||
loadRow(newDoc);
|
||||
Date dataCmov = doc.getDataCmov();
|
||||
if (dataCmov.before(UtilityDate.getTodayWithoutTime())) {
|
||||
dataCmov = UtilityDate.getTodayWithoutTime();
|
||||
}
|
||||
|
||||
newDoc
|
||||
.setCodDtip(doc.getCodDtipNew())
|
||||
.setPrevistaFat(null)
|
||||
.setNumDocForn(doc.getNumDocForn());
|
||||
.setCodDtip(doc.getCodDtipNew())
|
||||
.setPrevistaFat(null)
|
||||
.setDataCmov(dataCmov)
|
||||
.setNumDocForn(doc.getNumDocForn());
|
||||
|
||||
newDoc.setOperation(OperationType.INSERT);
|
||||
newDoc.getDtbDocr().stream().forEach(r->r.setOperation(OperationType.INSERT));
|
||||
newDoc.getDtbDocr().stream().forEach(r -> r.setOperation(OperationType.INSERT));
|
||||
if (doc.getAllegati() != null && !doc.getAllegati().isEmpty()) {
|
||||
List<DrlDocAttached> drlDocAttacheds = new ArrayList<>();
|
||||
for (CambioTipoDocDTO.Allegati allegato : doc.getAllegati()) {
|
||||
|
||||
Reference in New Issue
Block a user