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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Giuseppe Scorrano
2024-08-01 13:49:09 +02:00
parent d528bcbd72 8626ced5ba
commit 51ceb69192
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ems-core/src/main/java/it/integry/ems_model/utility/UtilityDB.java
View File

@@ -483,7 +483,7 @@ public class UtilityDB {
public static <T> List<T> executeSimpleQueryOnlyFirstColumn(Connection conn, String querySql) throws SQLException {
List<T> object = new ArrayList<>();
List<HashMap<String, Object>> queryResults = executeSimpleQuery(conn, querySql);
if (queryResults != null && queryResults.size() > 0) {
if (queryResults != null && !queryResults.isEmpty()) {
object = new ArrayList<T>();
for (HashMap<String, Object> result : queryResults) {
T value = (T) result.get(result.keySet().toArray()[0]);

2
ems-engine/src/main/java/it/integry/ems/system/exchange/service/ExchangeDocumentImportService.java
View File

@@ -67,7 +67,6 @@ public class ExchangeDocumentImportService {
UtilityLocalDate.getNow(),
false, useTempTable);
exchangeUpdatedTestateData.forEach(x -> x.setUpdProgMaga(false));
final List<DtbDocr> exchangeImportedRigheData = importRigheDocumentiLavorazione(
@@ -88,6 +87,7 @@ public class ExchangeDocumentImportService {
List<EquatableEntityInterface> allRigheData = exchangeImportDataManagerService
.runSync(DtbDocr.class, exchangeImportedRigheData, exchangeUpdatedRigheData);
allTestateData.forEach(x -> ((DtbDoct)x).setUpdProgMaga(false));
allTestateData.stream()
.map(x -> (DtbDoct) x)