From 17d7ca6cc5419ef8ec1713f0106164fe83a8b449 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 16 六月 2023 10:20:32 +0800
Subject: [PATCH] 1
---
src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java b/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java
index 3fef537..afb8bf4 100644
--- a/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java
+++ b/src/main/java/com/yssh/service/impl/WarningAnalyseServiceImpl.java
@@ -372,10 +372,12 @@
String startTime = ymdhms.format(begin);
String endTime = ymdhms.format(end);
- List<WarningDetail> rs = warningDetailMapper.selectByTime(startTime, endTime);
- if (null == rs || rs.isEmpty()) {
- return null;
- }
+ List<WarningDetail> rs = new ArrayList<>();
+ List<WarningDetail> rsYj = warningDetailMapper.selectByTimeForYj(startTime, endTime);
+ if (null != rsYj && rsYj.size() > 0) rs.addAll(rsYj);
+
+ List<WarningDetail> rsBj = warningDetailMapper.selectByTimeForBj(startTime, endTime);
+ if (null != rsBj && rsBj.size() > 0) rs.addAll(rsBj);
List<WarningVo> list = new ArrayList<>();
for (WarningDetail wd : rs) {
--
Gitblit v1.9.3