From efb08fd828651bce8ca8b118230a7e815c3ff354 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 07 三月 2024 10:43:46 +0800
Subject: [PATCH] 更新Word统计

---
 src/main/java/com/lf/server/service/sys/ReportService.java |   29 +++++++++++++++++++----------
 1 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/lf/server/service/sys/ReportService.java b/src/main/java/com/lf/server/service/sys/ReportService.java
index 29dfcc9..c897a98 100644
--- a/src/main/java/com/lf/server/service/sys/ReportService.java
+++ b/src/main/java/com/lf/server/service/sys/ReportService.java
@@ -30,6 +30,7 @@
  * @date 2024-03-06
  */
 @Service
+@SuppressWarnings("ALL")
 public class ReportService implements ReportMapper {
     @Value("${sys.turfServer}")
     private String turfServer;
@@ -316,20 +317,27 @@
         List<String[]> addList = new ArrayList<>();
         for (CountEntity ce : list) {
             switch (re.getCode()) {
-                case "countOperates":
-                    addList.add(new String[]{"" + ce.getNo(), ce.getM1()});
-                    break;
-                case "countServices":
-
+                case "countSizesByType":
+                case "countSizesByPrj":
+                    addList.add(new String[]{"" + ce.getNo(), ce.getM1(), "" + ce.getCount(), ce.getM2()});
                     break;
                 case "countSizes":
-
+                    addList.add(new String[]{"" + ce.getNo(), ce.getM1(), ce.getM2()});
+                    break;
+                case "countOperates":
+                    addList.add(new String[]{"" + ce.getNo(), ce.getM1(), ce.getM2(), "" + ce.getCount()});
                     break;
                 case "countExplorationPoints":
-
+                    addList.add(new String[]{"" + ce.getNo(), ce.getM1(), "" + ce.getCount(), ce.getM2(), ce.getM3()});
+                    break;
+                case "countDemAreaByPrj":
+                case "countMptAreaByPrj":
+                case "countOsgbAreaByPrj":
+                case "countLasAreaByPrj":
+                    addList.add(new String[]{"" + ce.getNo(), ce.getM1(), ce.getM3()});
                     break;
                 default:
-
+                    addList.add(new String[]{"" + ce.getNo(), ce.getM1(), "" + ce.getCount()});
                     break;
             }
         }
@@ -358,7 +366,8 @@
             return null;
         }
 
-        int rows = 1, allCount = 0;
+        int rows = 1;
+        long allCount = 0;
         Double allSize = 0d, allArea = 0d;
         for (CountEntity ce : list) {
             ce.setNo(rows++);
@@ -372,7 +381,7 @@
             CountEntity ce = new CountEntity();
             ce.setNo(rows);
             ce.setM1("鎬昏");
-            ce.setCount((long) allCount);
+            ce.setCount(allCount);
             ce.setM2(FileHelper.getSizes(allSize));
             ce.setM3(FileHelper.getSquareMeter(allArea));
             list.add(ce);

--
Gitblit v1.9.3