From d91a430189fc003a8aab765d67c54b12e9f71451 Mon Sep 17 00:00:00 2001 From: MinaR Date: Tue, 15 Oct 2024 16:58:13 +0200 Subject: [PATCH] modifiche per doc finance --- .../Import/service/ScadenzeImportService.java | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/ems-engine/src/main/java/it/integry/ems/contabil/Import/service/ScadenzeImportService.java b/ems-engine/src/main/java/it/integry/ems/contabil/Import/service/ScadenzeImportService.java index ec294e5ee5..69829cb5c8 100644 --- a/ems-engine/src/main/java/it/integry/ems/contabil/Import/service/ScadenzeImportService.java +++ b/ems-engine/src/main/java/it/integry/ems/contabil/Import/service/ScadenzeImportService.java @@ -26,6 +26,7 @@ import java.sql.PreparedStatement; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; +import java.util.HashMap; import java.util.List; @Service @@ -131,22 +132,14 @@ public class ScadenzeImportService { } boolean forceIn2021 = false; - List diacodToCheckList = new ArrayList<>(); - List intercodeToCheckList = new ArrayList<>(); + HashMap checkList = new HashMap<>(); - diacodToCheckList.add("10216200"); - diacodToCheckList.add("10407300"); - diacodToCheckList.add("90254600"); + checkList.put("10216200", "21001276019001"); + checkList.put("10407300", "21 004001"); + checkList.put("90254600", "21241137001001"); - intercodeToCheckList.add("21001276019001"); - intercodeToCheckList.add("21004001"); - intercodeToCheckList.add("21241137001001"); - - for (int i = 0; i < diacodToCheckList.size(); i++) { - if (diacodToCheckList.get(i).equals(diacod) && intercodeToCheckList.get(i).equals(intercode)) { - forceIn2021 = true; - break; - } + if (checkList.containsKey(diacod) && checkList.get(diacod).equals(intercode.trim())) { + forceIn2021 = true; } if (forceIn2021 || (ctbPart == null && (anno != null && (anno < 2021 || dataDoc.before(UtilityDate.StringToDate("2021/07/01", "yyyy/MM/dd")))))) {