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/java/com/lf/server/service/sys/ReportService.java | 95 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 69 insertions(+), 26 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 0e6c212..722803c 100644
--- a/src/main/java/com/lf/server/service/sys/ReportService.java
+++ b/src/main/java/com/lf/server/service/sys/ReportService.java
@@ -11,6 +11,7 @@
import com.lf.server.helper.*;
import com.lf.server.mapper.sys.ReportMapper;
import com.lf.server.service.all.RedisService;
+import com.lf.server.service.data.DirService;
import com.lf.server.service.data.DownloadService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -50,6 +51,9 @@
@Resource
RedisService redisService;
+
+ @Resource
+ DirService dirService;
private final static Log log = LogFactory.getLog(ReportService.class);
@@ -245,6 +249,12 @@
return reportMapper.countGeologicHazardByPrj();
}
+ @Override
+ public List<CountEntity> countVariousDataByPrj(String code) {
+ code = StringUtils.isEmpty(code) || "ALL".equals(code) ? null : StringHelper.getRightLike(code);
+ return reportMapper.countVariousDataByPrj(code);
+ }
+
/**
* 缁熻閽诲瓟鐐归潰绉�
*/
@@ -296,7 +306,7 @@
/**
* 鍒涘缓鎶ュ憡
*/
- public void createReport(UserEntity ue, ReportEntity re, HttpServletResponse res) throws Exception {
+ public void createReport(UserEntity ue, ReportEntity re, String code, HttpServletResponse res) throws Exception {
AttachEntity ae = attachService.selectByGuid(re.getGuid());
if (null == ae) {
return;
@@ -310,7 +320,7 @@
if (!sourceFile.exists() || sourceFile.isDirectory()) {
return;
}
- generateReport(source, target, re);
+ generateReport(source, target, re, code);
File targetFile = new File(target);
if (!targetFile.exists() || sourceFile.isDirectory()) {
@@ -327,66 +337,88 @@
/**
* 鐢熸垚鎶ュ憡
*/
- private void generateReport(String source, String target, ReportEntity re) {
+ private void generateReport(String source, String target, ReportEntity re, String code) {
if (StaticData.S1.equals(re.getType())) {
- createWord(source, target, re);
+ createWord(source, target, re, code);
} else {
- createExcel(source, target, re);
+ createExcel(source, target, re, code);
}
}
/**
* 鐢熸垚Word
*/
- private void createWord(String source, String target, ReportEntity re) {
- List<CountEntity> list = selectListByMethodName(re);
+ private void createWord(String source, String target, ReportEntity re, String code) {
+ List<CountEntity> list = selectListByMethodName(re, code);
list = processListData(list);
- Map<String, List<CountEntity>> map = new HashMap<>(1);
- map.put("data", list);
+ Map<String, String> textMap = new HashMap<>();
+ if (!StringHelper.isEmpty(code)) {
+ textMap.put("title", "ALL".equals(code) ? "鎵�鏈夐」鐩�" : dirService.selectNameByCode(code));
+ list.remove(list.size() - 1);
+ }
- List<String[]> addList = new ArrayList<>();
+ List<String[]> tableList = new ArrayList<>();
for (CountEntity ce : list) {
switch (re.getCode()) {
case "countSizesByType":
case "countSizesByPrj":
- addList.add(new String[]{"" + ce.getNo(), ce.getM1(), "" + ce.getCount(), ce.getM2()});
+ tableList.add(new String[]{"" + ce.getNo(), ce.getM1(), "" + ce.getCount(), ce.getM2()});
break;
case "countSizes":
- addList.add(new String[]{"" + ce.getNo(), ce.getM1(), ce.getM2()});
+ tableList.add(new String[]{"" + ce.getNo(), ce.getM1(), ce.getM2()});
break;
case "countOperates":
- addList.add(new String[]{"" + ce.getNo(), ce.getM1(), ce.getM2(), "" + ce.getCount()});
+ tableList.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()});
+ tableList.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()});
+ case "countDlgAreaByPrj":
+ case "countDomAreaByPrj":
+ case "countGeoModelAreaByPrj":
+ tableList.add(new String[]{"" + ce.getNo(), ce.getM1(), ce.getM3()});
+ break;
+ case "countLineLength":
+ tableList.add(new String[]{"" + ce.getNo(), ce.getM1(), "" + ce.getLen()});
+ break;
+ case "countVariousDataByPrj":
+ String str = "count".equals(ce.getM2()) ? ce.getCount() + "涓�" : ("area".equals(ce.getM2()) ? ce.getM3() : ce.getLen() + "鍗冪背");
+ tableList.add(new String[]{"" + ce.getNo(), ce.getM1(), str});
break;
default:
- addList.add(new String[]{"" + ce.getNo(), ce.getM1(), "" + ce.getCount()});
+ tableList.add(new String[]{"" + ce.getNo(), ce.getM1(), "" + ce.getCount()});
break;
}
}
- WordHelper.generateWord(source, target, null, addList);
+ WordHelper.generateWord(source, target, textMap, tableList);
}
/**
* 鐢熸垚Excel
*/
- private void createExcel(String source, String target, ReportEntity re) {
- List<CountEntity> list = selectListByMethodName(re);
+ private void createExcel(String source, String target, ReportEntity re, String code) {
+ List<CountEntity> list = selectListByMethodName(re, code);
list = processListData(list);
- Map<String, List<CountEntity>> map = new HashMap<>(1);
- map.put("data", list);
+ Map<String, Object> map = new HashMap<>();
+ if (!StringHelper.isEmpty(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() + "鍗冪背"));
+ }
+ }
- ExcelHelper.writeToTemplate(source, target, map);
+ Map<String, List<CountEntity>> listMap = new HashMap<>(1);
+ listMap.put("data", list);
+
+ ExcelHelper.writeToTemplate(source, target, map, listMap);
}
/**
@@ -399,7 +431,7 @@
int rows = 1;
long allCount = 0;
- Double allSize = 0d, allArea = 0d;
+ Double allSize = 0d, allArea = 0d, allLen = 0d;
for (CountEntity ce : list) {
ce.setNo(rows++);
if (StringUtils.isEmpty(ce.getM2())) {
@@ -409,6 +441,7 @@
allCount += ce.getCount();
allSize += ce.getSizes();
allArea += ce.getArea();
+ allLen += ce.getLen();
}
if (list.size() > 0) {
CountEntity ce = new CountEntity();
@@ -419,6 +452,7 @@
ce.setM2(FileHelper.getSizes(allSize));
}
ce.setM3(FileHelper.getSquareMeter(allArea));
+ ce.setLen(allLen);
list.add(ce);
}
@@ -428,11 +462,17 @@
/**
* 鏍规嵁鏂规硶鍚嶇О鏌ヨ鏁版嵁鍒楄〃
*/
- private List<CountEntity> selectListByMethodName(ReportEntity re) {
+ private List<CountEntity> selectListByMethodName(ReportEntity re, String code) {
List<CountEntity> list = null;
try {
- Method method = ReportService.class.getDeclaredMethod(re.getCode());
- Object obj = method.invoke(this);
+ Object obj;
+ if (null != code) {
+ Method method = ReportService.class.getDeclaredMethod(re.getCode(), String.class);
+ obj = method.invoke(this, code);
+ } else {
+ Method method = ReportService.class.getDeclaredMethod(re.getCode());
+ obj = method.invoke(this);
+ }
if (obj instanceof List<?>) {
list = (List<CountEntity>) obj;
}
@@ -453,6 +493,9 @@
if (null == ce.getArea()) {
ce.setArea(0d);
}
+ if (null == ce.getLen()) {
+ ce.setLen(0d);
+ }
}
return list;
--
Gitblit v1.9.3