xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: xiaoguangbin:66b48737c53195570d85ebee6d002b836848ead3
Branches Tags
xiaoguangbin:mdc
xiaoguangbin:SelfStation
xiaoguangbin:master
..
compare: xiaoguangbin:f72f4d7a7afadb4b9aa85924790004bdc7780e40
Branches Tags
xiaoguangbin:mdc
xiaoguangbin:SelfStation
xiaoguangbin:master

No commits in common. "66b48737c53195570d85ebee6d002b836848ead3" and "f72f4d7a7afadb4b9aa85924790004bdc7780e40" have entirely different histories.
66b48737c5 ... f72f4d7a7a

2 changed files with 19 additions and 18 deletions
Show Stats Expand all files Collapse all files

35
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SpectrumAnalysisMapper.java
View File

@ -12,7 +12,8 @@ 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.util.Date;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
@ -25,8 +26,8 @@ public interface SpectrumAnalysisMapper {
List<String> stationTypes,
boolean CollectStopB,
boolean AcqStartB,
@Param("startTime") Date startTime,
@Param("endTime") Date endTime,
LocalDateTime startTime,
LocalDateTime endTime,
List<String> userStations,
boolean AllUsers,
String orderField, String orderType);
@ -34,8 +35,8 @@ public interface SpectrumAnalysisMapper {
Page<GardsSampleDataSpectrum> loadSampleData(IPage<GardsSampleDataSpectrum> page,
GardsSampleDataSpectrum gardsSampleData,
List<String> stationTypes, boolean CollectStopB,
boolean AcqStartB,@Param("startTime") Date startTime,
@Param("endTime") Date endTime, List<String> userStations,
boolean AcqStartB, LocalDateTime startTime,
LocalDateTime endTime, List<String> userStations,
boolean AllUsers, String orderField,
String orderType);
@ -43,7 +44,7 @@ public interface SpectrumAnalysisMapper {
List<GardsXeResultsSpectrum> getXeDataList(Integer sampleId);
String getQCFilePath(String siteDetCode, String collectStartStr);
String getQCFilePath(String siteDetCode, LocalDateTime collectStart);
CommentData viewComment(@Param(value = "sampleId") Integer sampleId);
@ -63,20 +64,20 @@ public interface SpectrumAnalysisMapper {
@Param(value = "statisticsQueryData") StatisticsQueryData statisticsQueryData);
List<StatisticsData> statisticsQueryCollection(
@Param(value = "startDate") Date startDate,
@Param(value = "endDate") Date endDate, List<Integer> detectorList);
@Param(value = "startDate") LocalDateTime startDate,
@Param(value = "endDate") LocalDateTime endDate, List<Integer> detectorList);
List<StatisticsData> statisticsQueryAcquisition(
@Param(value = "startDate") Date startDate,
@Param(value = "endDate") Date endDate, List<Integer> detectorList);
@Param(value = "startDate") LocalDateTime startDate,
@Param(value = "endDate") LocalDateTime endDate, List<Integer> detectorList);
List<StatisticsData> statisticsQueryXeVolumn(
@Param(value = "startDate") Date startDate,
@Param(value = "endDate") Date endDate, List<Integer> detectorList);
@Param(value = "startDate") LocalDateTime startDate,
@Param(value = "endDate") LocalDateTime endDate, List<Integer> detectorList);
List<StatisticsData> statisticsQuerySampleVolumn(
@Param(value = "startDate") Date startDate,
@Param(value = "endDate") Date endDate, List<Integer> detectorList);
@Param(value = "startDate") LocalDateTime startDate,
@Param(value = "endDate") LocalDateTime endDate, List<Integer> detectorList);
String getStatus(@Param(value = "sampleId") Integer sampleId);
@ -206,12 +207,12 @@ public interface SpectrumAnalysisMapper {
List<ThresholdResultHistory> selectThresholdHistoryBySampleId(
@Param("schemaName") String schemaName, @Param("sampleId") String sampleId,
@Param("startTime") Date startTime);
@Param("startTime") LocalDateTime startTime);
List<NuclideAnalysisInfo> selectXeDataPastYear(@Param("schemaName") String schemaName,
@Param("sampleId") String sampleId,
@Param(value = "userName") String userName,
@Param("startTime") Date startTime,
@Param("endTime") Date endTime);
@Param("startTime") LocalDateTime startTime,
@Param("endTime") LocalDateTime endTime);
}

2
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml
View File

@ -368,7 +368,7 @@
AND qc_samples.SPECTRAL_QUALIFIE = 'FULL'
AND qc_samples.ACQUISITION_START <![CDATA[ <= ]]>TO_DATE(#{collectStartStr} ,'yyyy-MM-DD HH24:mi:ss')
AND qc_samples.ACQUISITION_START <![CDATA[ <= ]]> #{collectStart}
)