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

elimintao filtro sbagliato su movimenti

Browse Source
This commit is contained in:
Mina Ruggiero
2025-10-29 12:58:46 +01:00
parent 9f696ec2cd
commit 2663f039a0
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ems-core/src/main/java/it/integry/ems_model/entity/NtbVariazioniExportLog.java
View File

@@ -4,6 +4,8 @@ import it.integry.ems_model.annotation.*;
import it.integry.ems_model.base.EntityBase; import it.integry.ems_model.base.EntityBase;
import org.kie.api.definition.type.PropertyReactive; import org.kie.api.definition.type.PropertyReactive;
import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonTypeName;
import java.time.LocalDateTime;
import java.util.Date; import java.util.Date;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
@@ -34,7 +36,7 @@ public class NtbVariazioniExportLog extends EntityBase {
private String codVlis; private String codVlis;
@SqlField(value = "data_export") @SqlField(value = "data_export")
private Date dataExport; private LocalDateTime dataExport;
@SqlField(value = "json_string", maxLength = -1) @SqlField(value = "json_string", maxLength = -1)
private String jsonString; private String jsonString;
@@ -66,11 +68,11 @@ public class NtbVariazioniExportLog extends EntityBase {
return this; return this;
} }
public Date getDataExport() { public LocalDateTime getDataExport() {
return dataExport; return dataExport;
} }
public NtbVariazioniExportLog setDataExport(Date dataExport) { public NtbVariazioniExportLog setDataExport(LocalDateTime dataExport) {
this.dataExport = dataExport; this.dataExport = dataExport;
return this; return this;
} }

1
ems-engine/src/main/java/it/integry/ems/retail/ReportVariazioni/service/VariazioniPvService.java
View File

@@ -856,7 +856,6 @@ public class VariazioniPvService {
" cod_mdep,\n" + " cod_mdep,\n" +
" MAX(data_ins) AS last_ins\n" + " MAX(data_ins) AS last_ins\n" +
" FROM doc\n" + " FROM doc\n" +
" WHERE data_reg <= '2025/10/14'\n" +
" GROUP BY cod_mdep, cod_mart),\n" + " GROUP BY cod_mdep, cod_mart),\n" +
" last_doc_tot AS (SELECT doc.*\n" + " last_doc_tot AS (SELECT doc.*\n" +
" FROM max_doc\n" + " FROM max_doc\n" +

4
ems-engine/src/main/java/it/integry/ems/retail/export/service/ScontriniZucchettiExportServices.java
View File

@@ -6,6 +6,8 @@ import it.integry.ems.export.base.EntityExportResponse;
import it.integry.ems.file_formatter.csv.CsvMapper; import it.integry.ems.file_formatter.csv.CsvMapper;
import it.integry.ems.retail.dto.ZucchettiHrDTO; import it.integry.ems.retail.dto.ZucchettiHrDTO;
import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager; import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
import it.integry.ems.utility.UtilityDirs;
import it.integry.ems.utility.UtilityFile;
import it.integry.ems_model.service.SetupGest; import it.integry.ems_model.service.SetupGest;
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;
@@ -175,7 +177,7 @@ public class ScontriniZucchettiExportServices {
if ( !dati.isEmpty()) { if ( !dati.isEmpty()) {
String fileName = "Forecast_" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".csv"; String fileName = UtilityDirs.getDirectoryExport(multiDBTransactionManager.getPrimaryConnection().getDbName(), type, format) + "//" + "Forecast_" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".csv";
File file = new File(fileName); File file = new File(fileName);
CsvMapper<ZucchettiHrDTO> mapper = new CsvMapper<>(); CsvMapper<ZucchettiHrDTO> mapper = new CsvMapper<>();

2
ems-engine/src/main/java/it/integry/ems/retail/export/service/VariazioniPvExportServices.java
View File

@@ -217,7 +217,7 @@ public class VariazioniPvExportServices {
} }
NtbVariazioniExportLog ntbVariazioniExportLog = NtbVariazioniExportLog ntbVariazioniExportLog =
new NtbVariazioniExportLog() new NtbVariazioniExportLog()
.setDataExport(new Date()) .setDataExport(UtilityLocalDate.getNowTime())
.setCodVlis(variazioniPvDTO.getCodVlis()) .setCodVlis(variazioniPvDTO.getCodVlis())
.setFormatFile(format) .setFormatFile(format)
.setJsonString(json) .setJsonString(json)