From 5f4c969ad23c5ec9b6e16051add5c20e63f8284a Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 15 三月 2024 17:39:26 +0800
Subject: [PATCH] 修改 按项目统计
---
src/main/java/com/lf/server/mapper/sys/ReportMapper.java | 2 +-
src/main/resources/mapper/sys/ReportMapper.xml | 9 ++++++---
src/main/java/com/lf/server/controller/data/DataCountController.java | 2 +-
src/main/resources/mapper/show/OneMapMapper.xml | 2 +-
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/DataCountController.java b/src/main/java/com/lf/server/controller/data/DataCountController.java
index 79d940e..1e528d8 100644
--- a/src/main/java/com/lf/server/controller/data/DataCountController.java
+++ b/src/main/java/com/lf/server/controller/data/DataCountController.java
@@ -365,7 +365,7 @@
}
@SysLog()
- @ApiOperation(value = "缁熻绠＄嚎闀垮害")
+ @ApiOperation(value = "鎸夐」鐩粺璁＄绾块暱搴�")
@GetMapping(value = "/countLineLength")
public ResponseMsg<Object> countLineLength() {
try {
diff --git a/src/main/java/com/lf/server/mapper/sys/ReportMapper.java b/src/main/java/com/lf/server/mapper/sys/ReportMapper.java
index c7f1743..a2a6ab6 100644
--- a/src/main/java/com/lf/server/mapper/sys/ReportMapper.java
+++ b/src/main/java/com/lf/server/mapper/sys/ReportMapper.java
@@ -256,7 +256,7 @@
public List<CountEntity> countDomAreaByPrj();
/**
- * 缁熻绠＄嚎闀垮害
+ * 鎸夐」鐩粺璁＄绾块暱搴�
*
* @return
*/
diff --git a/src/main/resources/mapper/show/OneMapMapper.xml b/src/main/resources/mapper/show/OneMapMapper.xml
index 4f083f5..dd0eaa2 100644
--- a/src/main/resources/mapper/show/OneMapMapper.xml
+++ b/src/main/resources/mapper/show/OneMapMapper.xml
@@ -290,7 +290,7 @@
<!-- 鎸夊ぇ绫荤粺璁� -->
<select id="countByMajor" resultType="com.lf.server.entity.ctrl.CountEntity">
- select '娴嬬粯锛圗SV锛�' "m1", '鏁板瓧绾垮垝鍥�' "m2", '骞虫柟鍗冪背' "m3", coalesce(sum(area), 0) "sizes" from lf.sys_line_buffer
+ select '娴嬬粯锛圗SV锛�' "m1", '鏁板瓧绾垮垝鍥�' "m2", '骞虫柟鍗冪背' "m3", cast( coalesce(sum(area), 0) / 1000000 as decimal(20, 2) ) "sizes" from lf.sys_line_buffer
union all
select '娴嬬粯锛圗SV锛�' "m1", '鏁板瓧姝ｅ皠褰卞儚鍥�' "m2", '骞虫柟鍗冪背' "m3", (
select cast( coalesce(sum(b.area), 0) / 1000000 as decimal(20, 2)) from lf.sys_meta b
diff --git a/src/main/resources/mapper/sys/ReportMapper.xml b/src/main/resources/mapper/sys/ReportMapper.xml
index fe6adaf..c45ef77 100644
--- a/src/main/resources/mapper/sys/ReportMapper.xml
+++ b/src/main/resources/mapper/sys/ReportMapper.xml
@@ -268,7 +268,10 @@
<!-- 缁熻鏁板瓧绾垮垝鍥鹃潰绉� -->
<select id="countDlgAreaByPrj" resultType="com.lf.server.entity.ctrl.CountEntity">
- select name "m1", area * 1000000 "area" from lf.sys_line_buffer;
+ select dir "m1", cast( coalesce(sum(area), 0) as decimal(20, 2) ) "area"
+ from lf.sys_line_buffer
+ group by code, dir
+ order by code;
</select>
<!-- 鎸夐」鐩粺璁℃暟瀛楁灏勫奖鍍忓浘闈㈢Н -->
@@ -282,7 +285,7 @@
order by code;
</select>
- <!-- 缁熻绠＄嚎闀垮害 -->
+ <!-- 鎸夐」鐩粺璁＄绾块暱搴� -->
<select id="countLineLength" resultType="com.lf.server.entity.ctrl.CountEntity">
select name "m1",
(select cast( coalesce(sum( ST_Length( ST_GeographyFromText( ST_AsText(geom) ) ) ) / 1000, 0) as decimal(20, 2) )
@@ -305,7 +308,7 @@
<select id="countGeoModelAreaByPrj" resultType="com.lf.server.entity.ctrl.CountEntity">
select name "m1",
(select cast( coalesce(sum(b.area), 0) as decimal(20, 2) )
- from lf.sys_meta b where b.dircode like a.code || '%') "area"
+ from lf.sys_meta b where b.type in ('fbx', 'ifc') and b.dircode like a.code || '%') "area"
from lf.sys_dir a
where pid = 0
order by code;
--
Gitblit v1.9.3