Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good

This commit is contained in:
2024-10-15 16:58:18 +02:00

View File

@@ -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<String> diacodToCheckList = new ArrayList<>();
List<String> intercodeToCheckList = new ArrayList<>();
HashMap<String, String> 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")))))) {