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

aggiunta nuova logica per stampare la firma nella stampa
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Mina Ruggiero
2025-01-29 18:21:08 +01:00
parent 9642228166
commit 5c119d4f34
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ems-core/src/main/java/it/integry/ems/service/ReportProcessor.java
View File

@@ -7,6 +7,7 @@ import it.integry.ems.report.dto.ReportTypeDTO;
import it.integry.ems.report.dto.SubreportDTO; import it.integry.ems.report.dto.SubreportDTO;
import it.integry.ems.sync.MultiDBTransaction.Connection; import it.integry.ems.sync.MultiDBTransaction.Connection;
import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager; import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
import it.integry.ems.user.UserSession;
import it.integry.ems.utility.UtilityDirs; import it.integry.ems.utility.UtilityDirs;
import it.integry.ems.utility.UtilityFile; import it.integry.ems.utility.UtilityFile;
import it.integry.ems.utility.UtilityPdf; import it.integry.ems.utility.UtilityPdf;
@@ -57,10 +58,10 @@ public class ReportProcessor {
private MultiDBTransactionManager multiDBTransactionManager; private MultiDBTransactionManager multiDBTransactionManager;
@Autowired @Autowired
private ResponseJSONObjectMapper jsonObjectMapper; private SetupGest setupGest;
@Autowired @Autowired
private SetupGest setupGest; private UserSession userSession;
private static final Logger logger = LogManager.getLogger(); private static final Logger logger = LogManager.getLogger();
@@ -287,6 +288,19 @@ public class ReportProcessor {
} }
hm_parameters.put("api_webservices", url); hm_parameters.put("api_webservices", url);
String firmaUtente;
String sql =
Query.format(
"SELECT id_attach FROM srl_user_attached WHERE user_name = %s", userSession.getUsername());
String idAttach = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(multiDBTransactionManager.getPrimaryConnection(), sql);
if ( !UtilityString.isNullOrEmpty(idAttach) ) {
firmaUtente = String.format("http://%s/ems-api/downloadStbFileAttachment/%s/firma_utente.png?profileDb=%s",
url, idAttach, multiDBTransactionManager.getPrimaryDatasource().getProfile());
hm_parameters.put("firma_utente", firmaUtente);
}
completeParameter(jasperDTO, hm_parameters); completeParameter(jasperDTO, hm_parameters);
JasperReportsContext jasperReportsContext = DefaultJasperReportsContext.getInstance(); JasperReportsContext jasperReportsContext = DefaultJasperReportsContext.getInstance();

8
ems-engine/src/main/java/it/integry/ems/document/Import/service/DocumentiAcquistoImportService.java
View File

@@ -1280,9 +1280,11 @@ public class DocumentiAcquistoImportService {
sql = Query.format( sql = Query.format(
"SELECT cod_mdep\n" + "SELECT cod_mdep\n" +
"FROM mtb_depo_intercode\n" + "FROM mtb_depo_intercode\n" +
"WHERE intercode = %s AND cod_forn = %s %s", "WHERE intercode = %s AND cod_forn = %s",
intercode, codAnag, (UtilityString.isNullOrEmpty(codVdes)?"":"AND cod_vdes = " + UtilityDB.valueToString(codVdes)) intercode, codAnag);
); if (!UtilityString.isNullOrEmpty(codVdes))
sql = sql + "AND cod_vdes = " + UtilityDB.valueToString(codVdes);
String codMdep = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(conn, sql); String codMdep = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(conn, sql);
if (UtilityString.isNullOrEmpty(codMdep)) { if (UtilityString.isNullOrEmpty(codMdep)) {