From 52d0a60fb770d11010d61d2cbef4ed8dbfa281aa Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 10 八月 2023 15:03:00 +0800
Subject: [PATCH] 1
---
src/main/java/com/yssh/mapper/XlsReportMapper.java | 6 +++---
src/main/resources/mapper/XlsReportMapper.xml | 13 +++----------
src/main/java/com/yssh/service/XlsReportService.java | 5 +++--
3 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/yssh/mapper/XlsReportMapper.java b/src/main/java/com/yssh/mapper/XlsReportMapper.java
index 87db22b..b94c2aa 100644
--- a/src/main/java/com/yssh/mapper/XlsReportMapper.java
+++ b/src/main/java/com/yssh/mapper/XlsReportMapper.java
@@ -32,17 +32,17 @@
/**
* 鏌ヨ鏃ュ潎鍊�
*/
- Double selectDayAvg(@Param("time") String time, @Param("name") String name);
+ double selectDayAvg(@Param("time") String time, @Param("name") String name);
/**
* 鏌ヨ绱鍊�
*/
- Double selectAccumulate(@Param("start") Integer start, @Param("end") Integer end, @Param("name") String name);
+ double selectAccumulate(@Param("start") Integer start, @Param("end") Integer end, @Param("name") String name);
/**
* 鏌ヨ骞寸疮璁″��
*/
- Double selectYearAccumulate(@Param("time") String time, @Param("name") String name);
+ double selectYearAccumulate(@Param("time") String time, @Param("name") String name);
/**
* 鏍规嵁鏃堕棿鏌ヨ婧簮
diff --git a/src/main/java/com/yssh/service/XlsReportService.java b/src/main/java/com/yssh/service/XlsReportService.java
index e010172..35f0767 100644
--- a/src/main/java/com/yssh/service/XlsReportService.java
+++ b/src/main/java/com/yssh/service/XlsReportService.java
@@ -117,6 +117,7 @@
List<String> list = new ArrayList<>();
for (SuYuan700 su : suList) {
List<String> sub = new ArrayList<>();
+ sub.add(DateUtils.getYyyyMmDdHh(su.getCreateTime()));
if (null != su.getAddr1())
sub.add(su.getAddr1() + "锛屾鐜囷細" + (su.getOdds1() * 100) + "%锛孹锛�" + su.getX1() + "锛孻锛�" + su.getY1());
if (null != su.getAddr2())
@@ -148,14 +149,14 @@
String name = "AI-" + (i < 10 ? "0" : "") + i;
double rjz = mapper.selectDayAvg(yyyymmdd + "%", name);
double lj = mapper.selectAccumulate(start, end, name);
- double lastLj = mapper.selectYearAccumulate(lastYear, 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");
String ys = getYs(suList);
- list.add(new DayExcel("" + rjz, "" + lj, "" + ljtb, ys, "", "", ""));
+ list.add(new DayExcel("" + rjz, "" + lj, ljtb + "%", ys, "", "", ""));
}
String filePath = createExcel("day", yesterday, list);
diff --git a/src/main/resources/mapper/XlsReportMapper.xml b/src/main/resources/mapper/XlsReportMapper.xml
index f01b6c0..9a644b8 100644
--- a/src/main/resources/mapper/XlsReportMapper.xml
+++ b/src/main/resources/mapper/XlsReportMapper.xml
@@ -38,28 +38,21 @@
<!-- 鏌ヨ鏃ュ潎鍊� -->
<select id="selectDayAvg" resultType="java.lang.Double">
- select format(avg(value), 2)
- from yssh_qxsh
- where time like #{time} and name = #{name};
- </select>
-
- <!-- 鏌ヨ鏃ュ潎鍊� -->
- <select id="selectDayAvg" resultType="java.lang.Double">
- select format(avg(value), 2)
+ select ifnull(format(avg(value), 2), 0)
from yssh_qxsh
where time like #{time} and name = #{name};
</select>
<!-- 鏌ヨ绱鍊� -->
<select id="selectAccumulate" resultType="java.lang.Double">
- select format(avg(value), 2)
+ select ifnull(format(avg(value), 2), 0)
from yssh_qxsh
where time between #{start} and #{end} and name = #{name};
</select>
<!-- 鏌ヨ骞寸疮璁″�� -->
<select id="selectYearAccumulate" resultType="java.lang.Double">
- select format(avg(value), 2)
+ select ifnull(format(avg(value), 2), 0)
from yssh_qxsh
where time like #{time} and name = #{name};
</select>
--
Gitblit v1.9.3