Merge remote-tracking branch 'origin/station' into station

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java

@@ -3766,6 +3766,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
         }else {//如果没有分析过就新增--GARDS_ANALYSES
             spectrumAnalysisMapper.insertGardsAnalyses(gardsAnalyses);
         }
+        betaDataFile.setSampleId(String.valueOf(sampleId));
         //查询analysisId根据sampleId 分析员名称--GARDS_ANALYSES
         GardsAnalysesSpectrum analysis = spectrumAnalysisMapper.getAnalysis("RNMAN.GARDS_ANALYSES", sampleId, userName);
         Integer idAnalysis = analysis.getIdAnalysis();