连续检测月报周报及导出的汇总新增额外的统计数据

ruoyi-admin/src/main/java/com/ruoyi/web/controller/business/BusinessController.java

@@ -353,7 +353,7 @@ public class BusinessController extends BaseController {
         //拼接表头和业务数据
         map.forEach((outKey, outMap) ->{
             //2024年10月10日10:55:13 由于列表给前端处理了合计，导出又做了一次，所以过滤掉（也可以在下面处理，稍微麻烦）
-            if(!"total".equals(outKey)){
+            if(!"total".equals(outKey) && !"calculate".equals(outKey)){
                 outMap.forEach((innerKey, list) ->{
                     List<String> headerList = new ArrayList<>();
                     for (ContinuousAssayResultRes continuousAssayResultRes : list) {

ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusinessServiceImpl.java

@@ -173,6 +173,20 @@ public class BusinessServiceImpl implements IBusinessService {
             extraList.add(continuousAssayResultRes);
             extraMap.put("合计", extraList);
             resultMap.put("total", extraMap);
+            //2024年10月21日14:14:53 最下面额外再添加新的维度的统计数据
+            HashMap<String, List<ContinuousAssayResultRes>> calculateMap = new HashMap<>();
+            List<ContinuousAssayResultRes> calculateList = new ArrayList<>();
+            //2024年10月21日14:43:43 额外统计的指标汇总信息
+            Map<String, List<ContinuousAssayBasic>> collect = list.stream().collect(Collectors.groupingBy(ContinuousAssayBasic::getAssayName));
+            collect.forEach((key, value) -> {
+                ContinuousAssayResultRes continuousAssayResultResCalculate = new ContinuousAssayResultRes();
+                continuousAssayResultResCalculate.setAssayName(key);
+                continuousAssayResultResCalculate.setAssayCounts(value.size());
+                continuousAssayResultResCalculate.setBx(null);
+                calculateList.add(continuousAssayResultResCalculate);
+            });
+            calculateMap.put("额外统计", calculateList);
+            resultMap.put("calculate", calculateMap);
         }
         return resultMap;
     }