From 1a5bc8d4ec543d71602b6dfae4bda45253cdc9b7 Mon Sep 17 00:00:00 2001 From: xiaoguangbin Date: Thu, 28 Sep 2023 14:46:09 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9Agamma=E8=87=AA=E5=8A=A8=E5=A4=84?= =?UTF-8?q?=E7=90=86panduan?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/modules/spectrum/SamplephdSpectrum.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SamplephdSpectrum.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SamplephdSpectrum.java index 4b88e7a3..9379e202 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SamplephdSpectrum.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SamplephdSpectrum.java @@ -77,13 +77,10 @@ public class SamplephdSpectrum extends S_D_Q_G_SpectrumHandler{ if(this.sourceData.system_type.equals(SystemType.BETA.getType())){ Sample_B_Analysis bAnalysis = new Sample_B_Analysis(this); bAnalysis.start(); -// Sample_B_Analysis bAnalysis = new Sample_B_Analysis(super.sampleData,super.mailFile.getAbsolutePath(), -// super.spectrumServiceQuotes,super.sourceData,super.ftpUtil,super.parsingProcessLog); -// bAnalysis.start(); } -// if (this.sourceData.system_type.equals(SystemType.GAMMA.getType())) { -// Sample_G_Analysis sample_g_analysis = new Sample_G_Analysis(super.sourceData, super.spectrumServiceQuotes, super.sampleData); -// sample_g_analysis.analysis(); -// } + if (this.sourceData.system_type.equals(SystemType.PARTICULATE.getType()) || this.sourceData.system_type.equals(SystemType.GAMMA.getType())) { + Sample_G_Analysis sample_g_analysis = new Sample_G_Analysis(super.sourceData, super.spectrumServiceQuotes, super.sampleData,super.ftpUtil); + sample_g_analysis.analysis(); + } } }