槽液结果导出

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java

@@ -636,9 +636,12 @@ public class LiquidTankTaskCopyController extends BladeController {
                             HttpServletResponse response) {
         LiquidTankReport report = reportService.getById(id);
 
-//        List<LiquidTankTaskCopyVO> list = service.getListByLiquidTankReportId(report.getId());
+        List<LiquidTankTaskCopyVO> list = new ArrayList<>();
+
+        if(null != report){
+            list = service.getListByLiquidTankReportIdNew(report.getId());
+        }
 
-        List<LiquidTankTaskCopyVO> list = service.getListByLiquidTankReportIdNew(report.getId());
         if(null != list && list.size() > 0){
 
             Long centerId = list.get(0).getWorkCenterId();
@@ -669,6 +672,23 @@ public class LiquidTankTaskCopyController extends BladeController {
                 throw new RuntimeException(e);
             }
 
+        }else{
+            try {
+                FullMergeExcelUtil.exportUserExcel(
+                        response,
+                        "槽液检测报告",
+                        "",
+                        "",
+                        new String[]{"取样时间", "温度(℃)", "槽号", "体积(L)", "分析项目", "规范下限(g/L)", "目标下限(g/L)",
+                                "添加点(g/L)", "目标值(g/L)","目标上限(g/L)","规范上限(g/L)","化验频率","化验值(g/L)",
+                                "药品计算公式","药品添加量","药品批次号","药品监督员签名","药品添加人签名","调整后化验值(g/L)",
+                                "是否合格","有效期","超出规范极限调整后的结果","槽液清理记录","控制规范"},
+                        list,
+                        new int[]{0}
+                );
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
         }
     }