fix：Code Merge

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java

@@ -130,8 +130,11 @@ public class SpectrumAnalysesController {
 
     @GetMapping("exportRLR")
     @ApiOperation(value = "导出RLR数据", notes = "导出RLR数据")
-    public void exportRLR(Integer sampleId, HttpServletResponse response) {
+    public void exportRLR(Integer sampleId, String sampleFileName,
-        spectrumAnalysisService.exportRLR(sampleId, response);
+                          String gasFileName, String detFileName,
+                          HttpServletRequest request,
+                          HttpServletResponse response) {
+        spectrumAnalysisService.exportRLR(sampleId, sampleFileName, gasFileName, detFileName, request, response);
     }
 
     @GetMapping("viewGammaDetectorCalibration")

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

@@ -45,7 +45,10 @@ public interface ISpectrumAnalysisService {
 
     Result viewRLR(Integer sampleId, String sampleFileName, String gasFileName, String detFileName, HttpServletRequest request);
 
-    void exportRLR(Integer sampleId, HttpServletResponse response);
+    void exportRLR(Integer sampleId, String sampleFileName,
+                   String gasFileName, String detFileName,
+                   HttpServletRequest request,
+                   HttpServletResponse response);
 
     Result viewGammaDetectorCalibration(Integer sampleId, String qcFileName, HttpServletRequest request);
 

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

@@ -41,8 +41,7 @@ import java.util.*;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import static org.jeecg.modules.base.enums.ExportTemplate.QcResult_B;
+import static org.jeecg.modules.base.enums.ExportTemplate.*;
-import static org.jeecg.modules.base.enums.ExportTemplate.SampleInfo_B;
 
 @Service("spectrumAnalysisService")
 @DS("ora")
@@ -1301,6 +1300,21 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
         return result;
     }
 
+    @Override
+    public void exportRLR(Integer sampleId, String sampleFileName,
+                          String gasFileName, String detFileName,
+                          HttpServletRequest request,
+                          HttpServletResponse response) {
+        Result<?> result = viewRLR(sampleId,sampleFileName,gasFileName,detFileName,request);
+        RlrDataValues rlrDataValues = (RlrDataValues)result.getResult();
+        Map<String,Object> dataMap = BeanUtil.beanToMap(rlrDataValues);
+        // 将Null值替换为"",避免空指针异常(或者在模板中进行判断)
+        dataMap.replaceAll((key, value) -> ObjectUtil.isNull(value) ? "" : value);
+        String export = "RLR-Beta.xls";
+        String template = RLR_B.getName();
+        ExportUtil.exportXls(response, template, dataMap,export);
+    }
+
     @Override
     public Result viewGammaDetectorCalibration(Integer sampleId, String qcFileName, HttpServletRequest request) {
         Result result = new Result();