From b6b0cb226fcf184525ee7b36af3a09471e9c0057 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 25 三月 2024 11:29:33 +0800
Subject: [PATCH] 修改数据统计的查询条件

---
 src/main/java/com/lf/server/controller/show/OneMapController.java |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/lf/server/controller/show/OneMapController.java b/src/main/java/com/lf/server/controller/show/OneMapController.java
index 789daa5..79718e5 100644
--- a/src/main/java/com/lf/server/controller/show/OneMapController.java
+++ b/src/main/java/com/lf/server/controller/show/OneMapController.java
@@ -16,6 +16,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 绠$綉涓�寮犲浘
@@ -368,7 +369,8 @@
     @ApiOperation(value = "鍗曚釜椤圭洰鏂囦欢绫诲瀷鏁伴噺")
     @GetMapping("/countProjectType")
     public ResponseMsg<Object> countProjectType(@RequestParam("projectCode") String projectCode) {
-        List<String> resList = oneMapService.countProjectType(projectCode);
+        List<Map<String, Object>> resList = oneMapService.countProjectType(projectCode);
+
         return success(resList);
     }
 
@@ -387,7 +389,8 @@
         return success(resList);
     }
 
-    // ============[ 鏁版嵁缁熻 - 2024-03-06]============
+    //============[鏁版嵁缁熻 - 2024-03-06]==================
+
     @SysLog()
     @ApiOperation(value = "鏁版嵁缁熻(鎸夊ぇ绫荤粺璁�)")
     @GetMapping("/countByMajor")
@@ -401,4 +404,18 @@
             return fail(ex.getMessage());
         }
     }
+
+    @SysLog()
+    @ApiOperation(value = "鏌ヨ璁$畻鏁版嵁")
+    @GetMapping("/selectCalcData")
+    public ResponseMsg<Object> selectCalcData(){
+        try {
+            String rs = oneMapService.calcData();
+
+            return success(rs);
+        }catch (Exception ex){
+            log.error(ex.getMessage(), ex);
+            return fail(ex.getMessage());
+        }
+    }
 }

--
Gitblit v1.9.3