From 1a07a49a7393e83d2d0c3fac50e222a593e18a41 Mon Sep 17 00:00:00 2001
From: duwenyuan <15600000461@163.com>
Date: Mon, 25 May 2026 09:38:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9QC=E6=96=87=E4=BB=B6=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=B8=8D=E5=87=BA=E6=9D=A5=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jeecg/modules/mapper/SpectrumAnalysisMapper.java   |  2 +-
 .../modules/mapper/xml/SpectrumAnalysisMapper.xml      |  6 +++---
 .../service/impl/SpectrumAnalysisServiceImpl.java      | 10 ++--------
 3 files changed, 6 insertions(+), 12 deletions(-)

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<GardsXeResultsSpectrum> 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 <![CDATA[ <= ]]>TO_DATE(#{collectStartStr} ,'yyyy-MM-DD HH24:mi:ss')
+            AND qc_samples.ACQUISITION_START <![CDATA[ <= ]]>#{collectStart}
 
             )
 
-            AND org_sample_data.SITE_DET_CODE = #{siteDetCode}
+            AND org_sample_data.SITE_DET_CODE = '${siteDetCode}'
 
         </where>
 
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);