From 11783ecb3b48fd743d68d11ade9786186aecfec3 Mon Sep 17 00:00:00 2001 From: 13693261870 <252740454@qq.com> Date: 星期五, 11 八月 2023 09:31:08 +0800 Subject: [PATCH] 1 --- src/main/java/com/yssh/service/XlsReportService.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/yssh/service/XlsReportService.java b/src/main/java/com/yssh/service/XlsReportService.java index b3e0393..5ce13df 100644 --- a/src/main/java/com/yssh/service/XlsReportService.java +++ b/src/main/java/com/yssh/service/XlsReportService.java @@ -165,8 +165,9 @@ String name = "AI-" + (i < 10 ? "0" : "") + i; double rjz = mapper.selectDayAvg(yyyymmdd + "%", name); // 鏃ュ潎鍊� double lj = mapper.selectAccumulate(yearStart, end, name); // 绱 - double lastLj = mapper.selectYearAccumulate(lastYear + "%", name); // 鍘诲勾绱 - double ljtb = CalculateUtils.round2((lj - lastLj) / lastLj * 100); // 绱鍚屾瘮 + double ljjz = mapper.selectYearAccumulate(yyyy + "%", name); // 浠婂勾绱鍧囧�� + double qnLjjz = mapper.selectYearAccumulate(lastYear + "%", name); // 鍘诲勾绱鍧囧�� + double ljtb = CalculateUtils.round2((ljjz - qnLjjz) / qnLjjz * 100); // 绱鍚屾瘮 MonitorPointPosition point = commonService.select3dCheckPointByName(name); String id = point.getId().substring(0, point.getId().lastIndexOf("_") + 1) + "0"; @@ -214,6 +215,7 @@ double lj = mapper.selectAccumulate(yearStart, intSun, name); // 绱 double lastLj = mapper.selectYearAccumulate(lastYear + "%", name); // 鍘诲勾绱 double ljtb = CalculateUtils.round2((lj - lastLj) / lastLj * 100); // 绱鍚屾瘮 + double syn = CalculateUtils.round2((lj - lastLj) / lastLj * 100); // 杈冧笂涓�骞村害鍙樺寲骞呭害 MonitorPointPosition point = commonService.select3dCheckPointByName(name); String id = point.getId().substring(0, point.getId().lastIndexOf("_") + 1) + "0"; -- Gitblit v1.9.3