From 87149106a9fa5a2df79e8493b1f31c026cf49df1 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 07 三月 2024 13:56:17 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/sys/ReportService.java | 43 +++++++++++++++++++++++++++----------------
1 files changed, 27 insertions(+), 16 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 29dfcc9..093c9a7 100644
--- a/src/main/java/com/lf/server/service/sys/ReportService.java
+++ b/src/main/java/com/lf/server/service/sys/ReportService.java
@@ -16,6 +16,7 @@
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@@ -30,6 +31,7 @@
* @date 2024-03-06
*/
@Service
+@SuppressWarnings("ALL")
public class ReportService implements ReportMapper {
@Value("${sys.turfServer}")
private String turfServer;
@@ -316,20 +318,27 @@
List<String[]> addList = new ArrayList<>();
for (CountEntity ce : list) {
switch (re.getCode()) {
- case "countOperates":
- addList.add(new String[]{"" + ce.getNo(), ce.getM1()});
- break;
- case "countServices":
-
+ case "countSizesByType":
+ case "countSizesByPrj":
+ addList.add(new String[]{"" + ce.getNo(), ce.getM1(), "" + ce.getCount(), ce.getM2()});
break;
case "countSizes":
-
+ addList.add(new String[]{"" + ce.getNo(), ce.getM1(), ce.getM2()});
+ break;
+ case "countOperates":
+ addList.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()});
+ break;
+ case "countDemAreaByPrj":
+ case "countMptAreaByPrj":
+ case "countOsgbAreaByPrj":
+ case "countLasAreaByPrj":
+ addList.add(new String[]{"" + ce.getNo(), ce.getM1(), ce.getM3()});
break;
default:
-
+ addList.add(new String[]{"" + ce.getNo(), ce.getM1(), "" + ce.getCount()});
break;
}
}
@@ -358,11 +367,14 @@
return null;
}
- int rows = 1, allCount = 0;
+ int rows = 1;
+ long allCount = 0;
Double allSize = 0d, allArea = 0d;
for (CountEntity ce : list) {
ce.setNo(rows++);
- ce.setM2(FileHelper.getSizes(ce.getSizes()));
+ if (StringUtils.isEmpty(ce.getM2())) {
+ ce.setM2(FileHelper.getSizes(ce.getSizes()));
+ }
ce.setM3(FileHelper.getSquareMeter(ce.getArea()));
allCount += ce.getCount();
allSize += ce.getSizes();
@@ -372,8 +384,10 @@
CountEntity ce = new CountEntity();
ce.setNo(rows);
ce.setM1("鎬昏");
- ce.setCount((long) allCount);
- ce.setM2(FileHelper.getSizes(allSize));
+ ce.setCount(allCount);
+ if (StringUtils.isEmpty(ce.getM2())) {
+ ce.setM2(FileHelper.getSizes(allSize));
+ }
ce.setM3(FileHelper.getSquareMeter(allArea));
list.add(ce);
}
@@ -383,14 +397,11 @@
/**
* 鏍规嵁鏂规硶鍚嶇О鏌ヨ鏁版嵁鍒楄〃
- *
- * @param re
- * @return
*/
private List<CountEntity> selectListByMethodName(ReportEntity re) {
List<CountEntity> list = null;
try {
- Method method = ReportService.class.getDeclaredMethod(re.getCode(), ReportService.class);
+ Method method = ReportService.class.getDeclaredMethod(re.getCode());
Object obj = method.invoke(this);
if (obj instanceof List<?>) {
list = (List<CountEntity>) obj;
--
Gitblit v1.9.3