Merge branch 'master' into develop
This commit is contained in:
@@ -63,7 +63,6 @@ public class ExchangeDocumentImportService {
|
|||||||
false, useTempTable);
|
false, useTempTable);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
final List<DtbDocr> exchangeImportedRigheData = importRigheDocumentiLavorazione(
|
final List<DtbDocr> exchangeImportedRigheData = importRigheDocumentiLavorazione(
|
||||||
exchangeMultiDb.getPrimaryConnection(),
|
exchangeMultiDb.getPrimaryConnection(),
|
||||||
UtilityLocalDate.getNow().minusMonths(1),
|
UtilityLocalDate.getNow().minusMonths(1),
|
||||||
@@ -82,7 +81,7 @@ public class ExchangeDocumentImportService {
|
|||||||
List<EquatableEntityInterface> allRigheData = exchangeImportDataManagerService
|
List<EquatableEntityInterface> allRigheData = exchangeImportDataManagerService
|
||||||
.runSync(DtbDocr.class, exchangeImportedRigheData, exchangeUpdatedRigheData);
|
.runSync(DtbDocr.class, exchangeImportedRigheData, exchangeUpdatedRigheData);
|
||||||
|
|
||||||
allTestateData.forEach(x -> ((DtbDoct)x).setUpdProgMaga(false));
|
allTestateData.forEach(x -> ((DtbDoct) x).setUpdProgMaga(false));
|
||||||
|
|
||||||
allTestateData.stream()
|
allTestateData.stream()
|
||||||
.map(x -> (DtbDoct) x)
|
.map(x -> (DtbDoct) x)
|
||||||
@@ -221,8 +220,19 @@ public class ExchangeDocumentImportService {
|
|||||||
}};
|
}};
|
||||||
|
|
||||||
exchangeImportDataManagerService.updateImportedStatus(connection, "dtb_doct_lav", importedKey, useTempTable);
|
exchangeImportDataManagerService.updateImportedStatus(connection, "dtb_doct_lav", importedKey, useTempTable);
|
||||||
exchangeImportDataManagerService.updateImportedStatus(connection, "dtb_docr_lav", importedKey, useTempTable);
|
|
||||||
// connection.commit();
|
|
||||||
|
final List<HashMap<String, Object>> importedRowKeys = importedDtbDoct.getDtbDocr().stream()
|
||||||
|
.map(x -> new HashMap<String, Object>() {{
|
||||||
|
put("data_doc", x.getDataDoc());
|
||||||
|
put("ser_doc", x.getSerDoc());
|
||||||
|
put("num_doc", x.getNumDoc());
|
||||||
|
put("cod_anag", x.getCodAnag());
|
||||||
|
put("cod_dtip", x.getCodDtip());
|
||||||
|
put("id_riga", x.getIdRiga());
|
||||||
|
}}).collect(Collectors.toList());
|
||||||
|
exchangeImportDataManagerService.updateImportedStatus(connection, "dtb_docr_lav", importedRowKeys, useTempTable);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user