From bab4adf858317cd6e2763425cb00101ef623d460 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 10 八月 2023 17:58:45 +0800
Subject: [PATCH] 1
---
src/main/java/com/yssh/service/XlsReportService.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/yssh/service/XlsReportService.java b/src/main/java/com/yssh/service/XlsReportService.java
index eb649d1..1d65fab 100644
--- a/src/main/java/com/yssh/service/XlsReportService.java
+++ b/src/main/java/com/yssh/service/XlsReportService.java
@@ -167,6 +167,7 @@
double lj = mapper.selectAccumulate(yearStart, end, name); // 绱
double lastLj = mapper.selectYearAccumulate(lastYear + "%", name); // 鍘诲勾绱
double ljtb = CalculateUtils.round2((lj - lastLj) / lastLj * 100); // 绱鍚屾瘮
+
MonitorPointPosition point = commonService.select3dCheckPointByName(name);
String id = point.getId().substring(0, point.getId().lastIndexOf("_") + 1) + "0";
// List<SuYuan700> suList = mapper.selectSuYuanByTime(id, yyyy_mm_dd + " 00:00:00", yyyy_mm_dd + " 23:00:00");
@@ -213,10 +214,12 @@
double lj = mapper.selectAccumulate(yearStart, intSun, name); // 绱
double lastLj = mapper.selectYearAccumulate(lastYear + "%", name); // 鍘诲勾绱
double ljtb = CalculateUtils.round2((lj - lastLj) / lastLj * 100); // 绱鍚屾瘮
+
MonitorPointPosition point = commonService.select3dCheckPointByName(name);
String id = point.getId().substring(0, point.getId().lastIndexOf("_") + 1) + "0";
List<SuYuan700> suList = mapper.selectSuYuanByStartAndEnd(id, name, yjz, intMon, intSun);
String ys = getYs(suList);
+
list.add(new WeekExcel("" + sz, zhb + "%", "", ztb + "%", "", "" + lj, "" + ljtb, "", ys, "", "", ""));
}
saveResult("week", sun, list);
@@ -236,10 +239,12 @@
List<MonthExcel> list = new ArrayList<>();
for (int i = 1; i < 47; i++) {
+ String name = "AI-" + (i < 10 ? "0" : "") + i;
//
- }
- String filePath = createExcel("month", end, list);
+ list.add(new MonthExcel());
+ }
+ saveResult("month", end, list);
} catch (Exception ex) {
logger.error(ex.getMessage(), ex);
}
--
Gitblit v1.9.3