From ac20dc99bf1f463365dba071973e08fffbd294b4 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 14 七月 2023 14:12:21 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/sys/ReportService.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 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 faae9ad..ced9c23 100644
--- a/src/main/java/com/lf/server/service/sys/ReportService.java
+++ b/src/main/java/com/lf/server/service/sys/ReportService.java
@@ -36,14 +36,14 @@
@Override
public Integer selectCount(String name, String code) {
- name = StringHelper.getLikeStr(name);
+ name = StringHelper.getLikeUpperStr(name);
return reportMapper.selectCount(name, code);
}
@Override
public List<ReportEntity> selectByPage(String name, String code, Integer limit, Integer offset) {
- name = StringHelper.getLikeStr(name);
+ name = StringHelper.getLikeUpperStr(name);
return reportMapper.selectByPage(name, code, limit, offset);
}
@@ -94,6 +94,11 @@
}
@Override
+ public List<CountEntity> countSizesByType() {
+ return reportMapper.countSizesByType();
+ }
+
+ @Override
public List<CountEntity> countServices() {
return reportMapper.countServices();
}
@@ -101,6 +106,11 @@
@Override
public List<CountEntity> countOperates() {
return reportMapper.countOperates();
+ }
+
+ @Override
+ public List<CountEntity> countSizesByPrj() {
+ return reportMapper.countSizesByPrj();
}
/**
@@ -140,26 +150,30 @@
private void generateReport(String source, String target, ReportEntity re) {
if (StaticData.S1.equals(re.getType())) {
switch (re.getCode()) {
- case "countOperates ":
+ case "countOperates":
createCountOperatesWord(source, target);
break;
case "countSizes":
createCountSizesWord(source, target);
break;
- default:
+ case "countServices":
createCountServicesWord(source, target);
+ break;
+ default:
break;
}
} else {
switch (re.getCode()) {
- case "countOperates ":
+ case "countOperates":
createCountOperatesExcel(source, target);
break;
case "countSizes":
createCountSizesExcel(source, target);
break;
- default:
+ case "countServices":
createCountServicesExcel(source, target);
+ break;
+ default:
break;
}
}
@@ -289,7 +303,7 @@
private DownloadEntity getDownloadEntity(UserEntity ue, String file) {
DownloadEntity de = new DownloadEntity();
de.setName(FileHelper.getFileName(file));
- // 1-Shp鏂囦欢锛�2-涓撻鍥撅紝3-婧愭暟鎹紝4-涓氬姟鏁版嵁锛�5-绠￠亾鍒嗘瀽锛�6-缁熻鎶ュ憡
+ // 1-Shp鏂囦欢锛�2-涓撻鍥撅紝3-鍏冩暟鎹紝4-涓氬姟鏁版嵁锛�5-绠￠亾鍒嗘瀽锛�6-缁熻鎶ュ憡锛�7-闄勪欢鏂囦欢锛�8-鐡︾墖鏂囦欢
de.setType(6);
de.setSizes(FileHelper.sizeToMb(new File(file).length()));
de.setDepid(ue.getDepid());
--
Gitblit v1.9.3