diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SpectrumAnalysisMapper.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SpectrumAnalysisMapper.java index a630ac79..5701deae 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SpectrumAnalysisMapper.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SpectrumAnalysisMapper.java @@ -12,8 +12,7 @@ import org.jeecg.modules.base.entity.original.GardsSampleData; import org.jeecg.modules.base.entity.rnman.*; import org.jeecg.modules.entity.*; import org.jeecg.modules.entity.vo.*; - -import java.time.LocalDateTime; +import java.util.Date; import java.util.List; import java.util.Map; @@ -26,8 +25,8 @@ public interface SpectrumAnalysisMapper { List stationTypes, boolean CollectStopB, boolean AcqStartB, - LocalDateTime startTime, - LocalDateTime endTime, + @Param("startTime") Date startTime, + @Param("endTime") Date endTime, List userStations, boolean AllUsers, String orderField, String orderType); @@ -35,8 +34,8 @@ public interface SpectrumAnalysisMapper { Page loadSampleData(IPage page, GardsSampleDataSpectrum gardsSampleData, List stationTypes, boolean CollectStopB, - boolean AcqStartB, LocalDateTime startTime, - LocalDateTime endTime, List userStations, + boolean AcqStartB,@Param("startTime") Date startTime, + @Param("endTime") Date endTime, List userStations, boolean AllUsers, String orderField, String orderType); @@ -44,7 +43,7 @@ public interface SpectrumAnalysisMapper { List getXeDataList(Integer sampleId); - String getQCFilePath(String siteDetCode, LocalDateTime collectStart); + String getQCFilePath(String siteDetCode, String collectStartStr); CommentData viewComment(@Param(value = "sampleId") Integer sampleId); @@ -64,20 +63,20 @@ public interface SpectrumAnalysisMapper { @Param(value = "statisticsQueryData") StatisticsQueryData statisticsQueryData); List statisticsQueryCollection( - @Param(value = "startDate") LocalDateTime startDate, - @Param(value = "endDate") LocalDateTime endDate, List detectorList); + @Param(value = "startDate") Date startDate, + @Param(value = "endDate") Date endDate, List detectorList); List statisticsQueryAcquisition( - @Param(value = "startDate") LocalDateTime startDate, - @Param(value = "endDate") LocalDateTime endDate, List detectorList); + @Param(value = "startDate") Date startDate, + @Param(value = "endDate") Date endDate, List detectorList); List statisticsQueryXeVolumn( - @Param(value = "startDate") LocalDateTime startDate, - @Param(value = "endDate") LocalDateTime endDate, List detectorList); + @Param(value = "startDate") Date startDate, + @Param(value = "endDate") Date endDate, List detectorList); List statisticsQuerySampleVolumn( - @Param(value = "startDate") LocalDateTime startDate, - @Param(value = "endDate") LocalDateTime endDate, List detectorList); + @Param(value = "startDate") Date startDate, + @Param(value = "endDate") Date endDate, List detectorList); String getStatus(@Param(value = "sampleId") Integer sampleId); @@ -207,12 +206,12 @@ public interface SpectrumAnalysisMapper { List selectThresholdHistoryBySampleId( @Param("schemaName") String schemaName, @Param("sampleId") String sampleId, - @Param("startTime") LocalDateTime startTime); + @Param("startTime") Date startTime); List selectXeDataPastYear(@Param("schemaName") String schemaName, @Param("sampleId") String sampleId, @Param(value = "userName") String userName, - @Param("startTime") LocalDateTime startTime, - @Param("endTime") LocalDateTime endTime); + @Param("startTime") Date startTime, + @Param("endTime") Date endTime); }