fix：Bug Fix

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/bizVo/GammaRLR.java

@@ -1,9 +1,7 @@
 package org.jeecg.modules.base.bizVo;
 
 import lombok.Data;
-import org.jeecg.modules.entity.vo.TableAssociation;
-import org.jeecg.modules.entity.vo.TablePeakFit;
-import org.jeecg.modules.entity.vo.TableResult;
+import org.jeecg.modules.entity.vo.*;
 
 import java.util.List;
 
@@ -74,13 +72,13 @@ public class GammaRLR {
     private List<TableResult> Result;
 
     // #NuclideRatios
-
+    private List<NuclideRatios> NuclideRatios;
 
     // #g_CoincidenceCorrection
-
+    private List<GCoincidenceCorrection> g_CoincidenceCorrection;
 
     // #MDA
-
+    private List<Mda> mda;
 
     // #Conclusions
     private String conclusion_person;

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/GCoincidenceCorrection.java

@@ -0,0 +1,16 @@
+package org.jeecg.modules.entity.vo;
+
+import lombok.Data;
+import java.io.Serializable;
+
+@Data
+public class GCoincidenceCorrection implements Serializable {
+
+    private String nuclide;
+
+    private String energy;
+
+    private String correctionFactor;
+
+    private String uncertainty;
+}

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/Mda.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.entity.vo;
+
+import lombok.Data;
+import java.io.Serializable;
+
+@Data
+public class Mda implements Serializable {
+
+    private String nuclide;
+
+    private String mda;
+
+    private String mdc;
+}

jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/NuclideRatios.java

@@ -0,0 +1,20 @@
+package org.jeecg.modules.entity.vo;
+
+import lombok.Data;
+import java.io.Serializable;
+
+@Data
+public class NuclideRatios implements Serializable {
+
+    private String nuclide1;
+
+    private String nuclide2;
+
+    private String ratio;
+
+    private String ratioErr;
+
+    private String referenceTime;
+
+    private String zeroTime;
+}

jeecg-boot-base-core/src/main/resources/excelTemplate/Gamma.RLR

@@ -61,8 +61,11 @@ ${Reference_physical}
 ${Result_act_ref} ${Result_conc_ref}
 ${Result}
 #NuclideRatios
+${NuclideRatios}
 #g_CoincidenceCorrection
+${g_CoincidenceCorrection}
 #MDA
+${mda}
 #Conclusions
 ${conclusion_person}
 ~IDCSummary

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

@@ -1892,8 +1892,10 @@ public class GammaServiceImpl implements IGammaService {
                 }
             }
             item.setStandard(standard);
-            if(StrUtil.equals(name, "Xe133-MDC (uBq/m3)"))
+            if(StrUtil.equals(name, "Xe133-MDC (uBq/m3)")){
                 qcResultList.add(0, item);
+                continue;
+            }
             qcResultList.add(item);
         }
         result.setSuccess(true);
@@ -2076,8 +2078,10 @@ public class GammaServiceImpl implements IGammaService {
         // 正则表达式，匹配${}中的内容
         String regex = "\\$\\{([^}]+)}";
         List<String> newLines = new ArrayList<>();
-        List<String> list = ListUtil.toList("peakFit","Association","Result");
-        List<String> skip = ListUtil.toList("${peakFit}","${Association}","${Result}");
+        List<String> list = ListUtil.toList("peakFit", "Association", "Result",
+                "NuclideRatios", "g_CoincidenceCorrection", "mda");
+        List<String> skip = ListUtil.toList("${peakFit}", "${Association}", "${Result}",
+                "${NuclideRatios}", "${g_CoincidenceCorrection}", "${mda}");
         for (String line : lines) {
             if (StrUtil.isBlank(line)) continue;
             List<String> fieldNames = ReUtil.findAllGroup1(regex, line);
@@ -2102,6 +2106,15 @@ public class GammaServiceImpl implements IGammaService {
                         case "Result":
                             lineList = ClassUtil.objsStr((List<TableResult>)value);
                             break;
+                        case "NuclideRatios":
+                            lineList = ClassUtil.objsStr((List<NuclideRatios>)value);
+                            break;
+                        case "g_CoincidenceCorrection":
+                            lineList = ClassUtil.objsStr((List<GCoincidenceCorrection>)value);
+                            break;
+                        case "mda":
+                            lineList = ClassUtil.objsStr((List<Mda>)value);
+                            break;
                         default:
                             break;
                     }

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

@@ -134,7 +134,7 @@ public class SpectrumFileServiceImpl implements ISpectrumFileService {
             if (StrUtil.isNotBlank(name)){
                 String[] names = name.split(comma);
                 ftpFiles = ftpFiles.stream()
-                        .filter(file -> StrUtil.containsAnyIgnoreCase(file.getName(),names))
+                        .filter(file -> containsAllIgnoreCase(file.getName(),names))
                         .collect(Collectors.toList());
             }
             for (FTPFile ftpFile : ftpFiles) {
@@ -180,4 +180,12 @@ public class SpectrumFileServiceImpl implements ISpectrumFileService {
         }
         return String.format("%.2f", fileSize) + StringPool.SPACE + units[index];
     }
+
+    private boolean containsAllIgnoreCase(String string, CharSequence... testStrs){
+        for (CharSequence testStr : testStrs) {
+            if (!StrUtil.containsIgnoreCase(string, testStr))
+                return false;
+        }
+        return true;
+    }
 }