Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
This commit is contained in:
@@ -377,11 +377,6 @@ public class AccountingBusinessLogic {
|
||||
pagaScadenze(testata.getDataCmov(), residuo, elencoScadenze);
|
||||
|
||||
if (!elencoScadenze.isEmpty()) {
|
||||
List<CtbScad> finalElencoScadenze = elencoScadenze;
|
||||
ctbMovtRC.getCtbMovr().stream()
|
||||
.filter(x->x.getNumDoc() != null)
|
||||
.forEach(x->x.setCtbScad(finalElencoScadenze));
|
||||
|
||||
testata.setCtbScad(elencoScadenze);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -723,12 +723,14 @@ public class AccountingRules extends QueryRules {
|
||||
Query.format(
|
||||
"SELECT cast(count(*) as bit) " +
|
||||
" FROM ctb_parr " +
|
||||
" WHERE cod_anag = %s AND " +
|
||||
" WHERE num_cmov = %S AND " +
|
||||
"cod_anag = %s AND " +
|
||||
"tipo_anag = %s AND " +
|
||||
"anno_part = %s AND " +
|
||||
"ser_doc = %s AND " +
|
||||
"num_doc = %s AND " +
|
||||
"id_riga = %s ",
|
||||
ctbMovr.getNumCmov(),
|
||||
ctbMovr.getCodAnag(),
|
||||
ctbMovr.getTipoAnag(),
|
||||
ctbMovr.getAnnoPart(),
|
||||
|
||||
Reference in New Issue
Block a user