From 60db4b4d07d34d808dda579360360a1031abf11a Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 11 三月 2024 17:10:16 +0800
Subject: [PATCH] 修改统计结果
---
src/main/resources/mapper/sys/ReportMapper.xml | 17 +++++++++++------
src/main/resources/mapper/show/OneMapMapper.xml | 12 +++++++++---
2 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/mapper/show/OneMapMapper.xml b/src/main/resources/mapper/show/OneMapMapper.xml
index 5aa2b89..c3591de 100644
--- a/src/main/resources/mapper/show/OneMapMapper.xml
+++ b/src/main/resources/mapper/show/OneMapMapper.xml
@@ -290,15 +290,21 @@
<!-- 鎸夊ぇ绫荤粺璁� -->
<select id="countByMajor" resultType="com.lf.server.entity.ctrl.CountEntity">
- select '娴嬬粯锛圗SV锛�' "m1", '鏁板瓧绾垮垝鍥�' "m2", '骞虫柟鍗冪背' "m3", 0.0 "sizes"
+ select '娴嬬粯锛圗SV锛�' "m1", '鏁板瓧绾垮垝鍥�' "m2", '骞虫柟鍗冪背' "m3", 0.0 "sizes"
union all
- select '娴嬬粯锛圗SV锛�' "m1", '鏁板瓧姝ｅ皠褰卞儚鍥�' "m2", '骞虫柟鍗冪背' "m3", 0.0 "sizes"
+ select '娴嬬粯锛圗SV锛�' "m1", '鏁板瓧姝ｅ皠褰卞儚鍥�' "m2", '骞虫柟鍗冪背' "m3", (
+ select coalesce(sum(b.area), 0) from lf.sys_meta b
+ inner join lf.sys_dir c on b.dircode = c.code
+ where c.name = '鏁板瓧姝ｅ皠褰卞儚鍥�' and b.type in ('img', 'tif', 'tiff') ) "sizes"
union all
select '娴嬬粯锛圗SV锛�' "m1", '绠＄嚎鏁版嵁' "m2", '鍗冪背' "m3", cast( sum( st_length( st_geographyfromtext( st_astext(geom) ) ) ) / 1000 as decimal(12, 2) ) "sizes" from bs.m_pipeline
union all
select '鍕樺療锛圗GE锛�' "m1", '鍕樻帰鐐�' "m2", '涓�' "m3", count(*) "sizes" from bs.s_explorationpoint
union all
- select '鍕樺療锛圗GE锛�' "m1", '涓夌淮鍦拌川妯″瀷' "m2", '骞虫柟绫�' "m3", 0.0 "sizes"
+ select '鍕樺療锛圗GE锛�' "m1", '涓夌淮鍦拌川妯″瀷' "m2", '骞虫柟绫�' "m3", (
+ select coalesce(sum(b.area), 0) from lf.sys_meta b
+ inner join lf.sys_dir c on b.dircode = c.code
+ where b.type in ('fbx', 'ifc', 'rvt') ) "sizes"
union all
select '鍦扮伨锛圗GD锛�' "m1", '鍦扮伨鐐�' "m2", '涓�' "m3", count(*) "sizes" from bd.b_geologic_hazard;
</select>
diff --git a/src/main/resources/mapper/sys/ReportMapper.xml b/src/main/resources/mapper/sys/ReportMapper.xml
index 1a2450e..b5cdde5 100644
--- a/src/main/resources/mapper/sys/ReportMapper.xml
+++ b/src/main/resources/mapper/sys/ReportMapper.xml
@@ -145,13 +145,16 @@
<!-- 鎸夐」鐩粺璁℃暟瀛楅珮绋嬫ā鍨嬮潰绉� -->
<select id="countDemAreaByPrj" resultType="com.lf.server.entity.ctrl.CountEntity">
- select name "m1", 0.0 "area"
+ select name "m1",
+ (select coalesce(sum(b.area), 0) from lf.sys_meta b
+ inner join lf.sys_dir c on b.dircode = c.code
+ where c.name = '鏁板瓧楂樼▼妯″瀷' and b.type in ('dem', 'tif', 'tiff') and b.depcode like a.code || '%') "area"
from lf.sys_dir a
where pid = 0
order by code;
</select>
- <!-- 鎸夐」鐩粺璁′笁缁村湴褰㈡ā鍨嬮潰绉� -->
+ <!-- 鎸夐」鐩粺璁′笁缁村湴褰㈡ā鍨嬮潰绉�:mpt -->
<select id="countMptAreaByPrj" resultType="com.lf.server.entity.ctrl.CountEntity">
select name "m1", 0.0 "area"
from lf.sys_dir a
@@ -159,17 +162,19 @@
order by code;
</select>
- <!-- 鎸夐」鐩粺璁″�炬枩鎽勫奖妯″瀷闈㈢Н -->
+ <!-- 鎸夐」鐩粺璁″�炬枩鎽勫奖妯″瀷闈㈢Н:osgb -->
<select id="countOsgbAreaByPrj" resultType="com.lf.server.entity.ctrl.CountEntity">
- select name "m1", 0.0 "area"
+ select name "m1",
+ (select coalesce(sum(area), 0) from lf.sys_meta b where b.type = 'osgb' and b.depcode like a.code || '%') "area"
from lf.sys_dir a
where pid = 0
order by code;
</select>
- <!-- 鎸夐」鐩粺璁℃縺鍏夌偣浜戞ā鍨嬮潰绉� -->
+ <!-- 鎸夐」鐩粺璁℃縺鍏夌偣浜戞ā鍨嬮潰绉�:las,laz -->
<select id="countLasAreaByPrj" resultType="com.lf.server.entity.ctrl.CountEntity">
- select name "m1", 0.0 "area"
+ select name "m1",
+ (select coalesce(sum(area), 0),count(*) from lf.sys_meta b where b.type in ('las', 'laz') and b.depcode like a.code || '%') "area"
from lf.sys_dir a
where pid = 0
order by code;
--
Gitblit v1.9.3