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 5701deae..41a1c029 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 @@ -43,7 +43,7 @@ public interface SpectrumAnalysisMapper { List getXeDataList(Integer sampleId); - String getQCFilePath(String siteDetCode, String collectStartStr); + String getQCFilePath(String siteDetCode, Date collectStart); CommentData viewComment(@Param(value = "sampleId") Integer sampleId); diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml index 9f0ba1fa..7cc2e081 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml @@ -362,17 +362,17 @@ FROM ORIGINAL.GARDS_SAMPLE_DATA qc_samples - WHERE qc_samples.SITE_DET_CODE = #{siteDetCode} + WHERE qc_samples.SITE_DET_CODE = '${siteDetCode}' AND qc_samples.DATA_TYPE = 'Q' AND qc_samples.SPECTRAL_QUALIFIE = 'FULL' - AND qc_samples.ACQUISITION_START TO_DATE(#{collectStartStr} ,'yyyy-MM-DD HH24:mi:ss') + AND qc_samples.ACQUISITION_START #{collectStart} ) - AND org_sample_data.SITE_DET_CODE = #{siteDetCode} + AND org_sample_data.SITE_DET_CODE = '${siteDetCode}' diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java index ac757d73..8aba182d 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java @@ -522,12 +522,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport String qcFileName = ""; if (Objects.nonNull(dbSpectrumFilePath.getCollectStart()) && StringUtils.isNotBlank(dbSpectrumFilePath.getSiteDetCode())) { - String collectStartStr = - DateUtils.formatDate(dbSpectrumFilePath.getCollectStart(), - "yyyy/MM/dd HH:mm:ss"); dbQcFilePath = spectrumAnalysisMapper.getQCFilePath( dbSpectrumFilePath.getSiteDetCode(), - collectStartStr); + dbSpectrumFilePath.getCollectStart()); if (StringUtils.isNotBlank(dbQcFilePath)) { qc = spectrumAnalysisMapper.findSampleByFilePath(dbQcFilePath); qcFileName = dbQcFilePath.substring( @@ -962,12 +959,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport resultMap.put("detBg", detBgMap); } // 查询Qc谱 - String collectStartStr = - DateUtils.formatDate(sampleData.getCollectStart(), - "yyyy/MM/dd HH:mm:ss"); String qcFilePath = spectrumAnalysisMapper.getQCFilePath(sampleData.getSiteDetCode(), - collectStartStr); + sampleData.getCollectStart()); if (StringUtils.isNotBlank(qcFilePath)) { GardsSampleData qcSampleData = spectrumAnalysisMapper.findSampleByFilePath(qcFilePath);