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

Aggiunto dipo report in query ConSegna

Browse Source
This commit is contained in:
Marco Elefante
2025-02-27 14:54:14 +01:00
parent 4cd32859c1
commit 630d5a85fb
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ems-engine/src/main/java/it/integry/ems/logistic/conSegna/dto/DatiConsegneDTO.java
View File

@@ -75,6 +75,9 @@ public class DatiConsegneDTO {
@SqlField(value = "flag_firmato")
private boolean flagFirmato;
@SqlField(value = "report_name")
private String reportName;
private DatiPdfDTO datiPdf;
private List<DettaglioRigheDTO> dettaglioRighe;
@@ -277,6 +280,15 @@ public class DatiConsegneDTO {
return this;
}
public String getReportName() {
return reportName;
}
public DatiConsegneDTO setReportName(String reportName) {
this.reportName = reportName;
return this;
}
public StatoImporto getStatoImporto() {
if (!this.isFlagFirmato()) {
return null;

5
ems-engine/src/main/java/it/integry/ems/logistic/conSegna/service/ConSegnaService.java
View File

@@ -81,7 +81,8 @@ public class ConSegnaService {
" CAST(IIF(lastInc.data_dist IS NULL, IIF(pdf.num_doc IS NULL, 0, IIF(gtb_paga.gg_prima_rata > 0, 0, 1)),\n" +
" 0) AS BIT) AS sospeso,\n" +
" DATEDIFF(DAY, dtb_doct.data_doc, lastInc.data_dist) AS gg_diff,\n" +
" CAST(IIF(pdf.versione IS NOT NULL, 1, 0) AS BIT) AS flag_firmato\n" +
" CAST(IIF(pdf.versione IS NOT NULL, 1, 0) AS BIT) AS flag_firmato,\n" +
" wtb_jrept.report_name\n" +
"FROM dtb_doct\n" +
" INNER JOIN gtb_anag ON dtb_doct.cod_anag = gtb_anag.cod_anag\n" +
" INNER JOIN dtb_tipi ON dtb_doct.cod_dtip = dtb_tipi.cod_dtip\n" +
@@ -94,6 +95,8 @@ public class ConSegnaService {
" LEFT OUTER JOIN lastInc ON lastInc.data_doc = dtb_doct.data_doc AND lastInc.num_doc = dtb_doct.num_doc AND\n" +
" lastInc.ser_doc = dtb_doct.ser_doc AND lastInc.cod_anag = dtb_doct.cod_anag AND\n" +
" lastInc.cod_dtip = dtb_doct.cod_dtip\n" +
" LEFT OUTER JOIN dtb_mod_stampa ON dtb_mod_stampa.mod_stampa = dtb_tipi.mod_stamp\n" +
" LEFT OUTER JOIN wtb_jrept ON dtb_mod_stampa.report_id = wtb_jrept.id\n" +
"WHERE ([username] IS NULL OR su.User_name = [username])\n" +
" AND dtb_doct.data_doc BETWEEN %s AND %s\n" +
" AND dtb_doct.gestione = 'V'\n" +