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

Finish Hotfix-100
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit is unstable
Details

Browse Source
This commit is contained in:
Mina Ruggiero
2025-10-30 13:22:37 +01:00
parent 605ec9a910 ac5361b9a8
commit af6b053215
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ems-core/src/main/java/it/integry/ems/rules/businessLogic/AccountingBusinessLogic.java
View File

@@ -377,6 +377,11 @@ public class AccountingBusinessLogic {
pagaScadenze(testata.getDataCmov(), residuo, elencoScadenze); pagaScadenze(testata.getDataCmov(), residuo, elencoScadenze);
if (!elencoScadenze.isEmpty()) { if (!elencoScadenze.isEmpty()) {
List<CtbScad> finalElencoScadenze = elencoScadenze;
ctbMovtRC.getCtbMovr().stream()
.filter(x->x.getNumDoc() != null)
.forEach(x->x.setCtbScad(finalElencoScadenze));
testata.setCtbScad(elencoScadenze); testata.setCtbScad(elencoScadenze);
} }
} }

7
ems-core/src/main/java/it/integry/ems/rules/completing/AccountingRules.java
View File

@@ -724,7 +724,12 @@ public class AccountingRules extends QueryRules {
"ser_doc = %s AND " + "ser_doc = %s AND " +
"num_doc = %s AND " + "num_doc = %s AND " +
"id_riga = %s ", "id_riga = %s ",
ctbMovr.getCodAnag(), ctbMovr.getTipoAnag(), ctbMovr.getAnnoPart(), ctbMovr.getSerDoc(), ctbMovr.getNumDoc(), ctbMovr.getIdRiga()); ctbMovr.getCodAnag(),
ctbMovr.getTipoAnag(),
ctbMovr.getAnnoPart(),
ctbMovr.getSerDoc(),
ctbMovr.getNumDoc(),
ctbMovr.getIdRiga());
boolean existRow = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(conn, sql); boolean existRow = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(conn, sql);

2
ems-engine/src/main/java/it/integry/ems/activity/controller/SteUPController.java
View File

@@ -18,7 +18,6 @@ import it.integry.ems_model.config.EmsRestConstants;
import it.integry.ems_model.entity.StbActivity; import it.integry.ems_model.entity.StbActivity;
import it.integry.ems_model.utility.Query; import it.integry.ems_model.utility.Query;
import it.integry.ems_model.utility.UtilityDB; import it.integry.ems_model.utility.UtilityDB;
import it.integry.ems_model.utility.UtilityDate;
import it.integry.ems_model.utility.UtilityHashMap; import it.integry.ems_model.utility.UtilityHashMap;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
@@ -33,7 +32,6 @@ import java.io.File;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.nio.file.Files; import java.nio.file.Files;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;