From 1c285b38777e9f37ee8d112e994443d3640b78c1 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 25 三月 2024 13:47:07 +0800
Subject: [PATCH] 解决查询出错
---
src/main/resources/mapper/sys/ReportMapper.xml | 3 ++-
src/main/java/com/lf/server/service/sys/ReportService.java | 4 ++--
2 files changed, 4 insertions(+), 3 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 24a32ad..722803c 100644
--- a/src/main/java/com/lf/server/service/sys/ReportService.java
+++ b/src/main/java/com/lf/server/service/sys/ReportService.java
@@ -354,7 +354,7 @@
Map<String, String> textMap = new HashMap<>();
if (!StringHelper.isEmpty(code)) {
- textMap.put("title", dirService.selectNameByCode(code));
+ textMap.put("title", "ALL".equals(code) ? "鎵�鏈夐」鐩�" : dirService.selectNameByCode(code));
list.remove(list.size() - 1);
}
@@ -408,7 +408,7 @@
Map<String, Object> map = new HashMap<>();
if (!StringHelper.isEmpty(code)) {
- map.put("title", dirService.selectNameByCode(code));
+ map.put("title", "ALL".equals(code) ? "鎵�鏈夐」鐩�" : dirService.selectNameByCode(code));
list.remove(list.size() - 1);
for (CountEntity ce : list) {
ce.setM2("count".equals(ce.getM2()) ? ce.getCount() + "涓�" : ("area".equals(ce.getM2()) ? ce.getM3() : ce.getLen() + "鍗冪背"));
diff --git a/src/main/resources/mapper/sys/ReportMapper.xml b/src/main/resources/mapper/sys/ReportMapper.xml
index 2ea38c6..5b6dfaa 100644
--- a/src/main/resources/mapper/sys/ReportMapper.xml
+++ b/src/main/resources/mapper/sys/ReportMapper.xml
@@ -329,9 +329,10 @@
from lf.sys_line_buffer
<where>
<if test="null != code">
- code like #{code})
+ code like #{code}
</if>
</where>
+ )
union all
(select '鏁板瓧楂樼▼妯″瀷' "m1", 'area' "m2", 0 "count", cast( coalesce(sum(b.area), 0) as decimal(20, 2) ) "area", 0 "len"
from lf.sys_meta b inner join lf.sys_dir c on b.dircode = c.code
--
Gitblit v1.9.3