beta功能loadByDB页面增加返回字段analysisId

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/GardsSampleDataSpectrum.java

@@ -34,6 +34,9 @@ public class GardsSampleDataSpectrum extends GardsSampleData {
     @TableField(exist = false)
     private String analyst;
 
+    @TableField(exist = false)
+    private Integer analysitId;
+
     @TableField(exist = false)
     @Excel(name = "NO" ,orderNum = "1")
     private Integer no;

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

@@ -42,6 +42,7 @@
                c.acquisition_start acquisitionStart,
                c.acquisition_real_sec acquisitionRealSec,
                c.acquisition_live_sec acquisitionLiveSec,
+               d.IDANALYSIS analysitId,
                d.analyst analyst,
                c.status status,
                c.input_file_name inputFileName

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

@@ -2984,6 +2984,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
                 }
                 //根据sample文件名称获取当前文件的缓存信息
                 BetaDataFile sampleBetaData = cache.getIfPresent(sampleFileName + "-" + userName);
+                if (Objects.isNull(sampleBetaData)) {
+                    sampleBetaData = new BetaDataFile();
+                }
                 //将当前文件用到的计算数据同步到需要计算的文件缓存
                 sampleBetaData.setBetaList(betaList);
                 sampleBetaData.setBetaFittingPara(betaFittingPara);