From 067c88ae08a81f3f0d0ac0a48cdc6b0f2c9f953e Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Fri, 10 Jan 2025 19:40:29 +0100
Subject: [PATCH] Aggiunto XLSX a esportazione CMD2Export

---
 .idea/runConfigurations/Tomcat9__1.xml           | 16 ++++++++++++++++
 .../ems_model/utility/dto/ConvertQueryDTO.java   |  1 +
 .../ems/system/controller/SystemController.java  |  3 +++
 3 files changed, 20 insertions(+)
 create mode 100644 .idea/runConfigurations/Tomcat9__1.xml

diff --git a/.idea/runConfigurations/Tomcat9__1.xml b/.idea/runConfigurations/Tomcat9__1.xml
new file mode 100644
index 0000000000..873f464e15
--- /dev/null
+++ b/.idea/runConfigurations/Tomcat9__1.xml
@@ -0,0 +1,16 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Tomcat9 #1" type="Remote" folderName="Frudis">
+    <module name="ems-engine" />
+    <option name="USE_SOCKET_TRANSPORT" value="true" />
+    <option name="SERVER_MODE" value="false" />
+    <option name="SHMEM_ADDRESS" />
+    <option name="HOST" value="127.0.0.1" />
+    <option name="PORT" value="8001" />
+    <option name="AUTO_RESTART" value="false" />
+    <RunnerSettings RunnerId="Debug">
+      <option name="DEBUG_PORT" value="8001" />
+      <option name="LOCAL" value="false" />
+    </RunnerSettings>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/ems-core/src/main/java/it/integry/ems_model/utility/dto/ConvertQueryDTO.java b/ems-core/src/main/java/it/integry/ems_model/utility/dto/ConvertQueryDTO.java
index cb2b0087b3..d4e1f41541 100644
--- a/ems-core/src/main/java/it/integry/ems_model/utility/dto/ConvertQueryDTO.java
+++ b/ems-core/src/main/java/it/integry/ems_model/utility/dto/ConvertQueryDTO.java
@@ -8,6 +8,7 @@ public class ConvertQueryDTO {
 
     public enum Format {
         XLS("XLS"),
+        XLSX("XLSX"),
         XML("XML"),
         CSV("CSV"),
         TXT("TXT"),
diff --git a/ems-engine/src/main/java/it/integry/ems/system/controller/SystemController.java b/ems-engine/src/main/java/it/integry/ems/system/controller/SystemController.java
index 1e7c698a8f..4fc30a499d 100644
--- a/ems-engine/src/main/java/it/integry/ems/system/controller/SystemController.java
+++ b/ems-engine/src/main/java/it/integry/ems/system/controller/SystemController.java
@@ -1619,6 +1619,9 @@ public class SystemController {
                     case XLS:
                         fileContent = UtilityResultSet.mapResultSetToXls(resultSet, "Foglio 1", false);
                         break;
+                    case XLSX:
+                        fileContent = UtilityResultSet.mapResultSetToXlsx(resultSet, "Foglio 1", false);
+                        break;
                     case XML:
                         String xmlContent = UtilityResultSet.mapResultSetToXML(resultSet, "element");
                         fileContent = xmlContent.getBytes();