From e9de9ec7a9a9677100a104718ed67ab85c8ca3a7 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Fri, 12 Jul 2024 17:06:28 +0800
Subject: [PATCH] 每日报汛昨日报汛简报修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/feign/SjztMdClientImpl.java | 8 ++++----
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IYwFloodReportInfoService.java | 2 +-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/controller/DownTemplateController.java | 3 +--
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/YwFloodReportInfoMapper.java | 6 ++++--
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/YwFloodReportInfoServiceImpl.java | 4 ++--
5 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/feign/SjztMdClientImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/feign/SjztMdClientImpl.java
index d60ffd3..3d42942 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/feign/SjztMdClientImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/feign/SjztMdClientImpl.java
@@ -101,9 +101,10 @@
List<SmsResultVO> dxyjList = smsRecordClient.smsSuccessList(vo);
//外呼统计
+ DateTimeFormatter formatter2 = DateTimeFormatter.ofPattern("yyyy-MM-dd");
CallTaskResultVO callTaskResult = new CallTaskResultVO();
- callTaskResult.setStartTime(oneDayBefore.format(formatter));
- callTaskResult.setEndTime(now.format(formatter));
+ callTaskResult.setStartTime(oneDayBefore.format(formatter2));
+ callTaskResult.setEndTime(now.format(formatter2));
List<CallTaskResultVO> whtjList = (List<CallTaskResultVO>) callService.getCallResultListTemp(null, callTaskResult);
HashMap<String, String> over10Params = new HashMap<>();
@@ -123,8 +124,7 @@
//昨日报汛内容
- QueryWrapper queryWrapper = new QueryWrapper();
- YwFloodReportInfo ywFloodReportInfo = ywFloodReportInfoService.getLatestReport(queryWrapper);
+ YwFloodReportInfo ywFloodReportInfo = ywFloodReportInfoService.getLatestReport(oneDayBefore.format(formatter2));
byte[] data = null;
if (MyDateUtils.isTodayInFloodSeason()) {
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/YwFloodReportInfoMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/YwFloodReportInfoMapper.java
index 9f0e11e..e9eb9f4 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/YwFloodReportInfoMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/YwFloodReportInfoMapper.java
@@ -7,6 +7,8 @@
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
+import java.util.Date;
+
/**
* @Author AIX
* @Date 2024/7/8 12:34
@@ -14,7 +16,7 @@
*/
public interface YwFloodReportInfoMapper extends BaseMapper<YwFloodReportInfo> {
- @Select("SELECT * FROM ywxt.yw_flood_report_info ORDER BY create_time DESC LIMIT 1")
- YwFloodReportInfo getLatestReport(@Param(Constants.WRAPPER) QueryWrapper<YwFloodReportInfo> queryWrapper);
+ @Select("SELECT * FROM ywxt.yw_flood_report_info WHERE create_time >= #{oneDayBefore} ORDER BY create_time ASC LIMIT 1")
+ YwFloodReportInfo getLatestReport(@Param("oneDayBefore") String oneDayBefore);
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IYwFloodReportInfoService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IYwFloodReportInfoService.java
index 41b623d..86f7cf9 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IYwFloodReportInfoService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IYwFloodReportInfoService.java
@@ -10,5 +10,5 @@
* @Version 1.0
*/
public interface IYwFloodReportInfoService extends BaseService<YwFloodReportInfo> {
- YwFloodReportInfo getLatestReport(QueryWrapper<YwFloodReportInfo> queryWrapper);
+ YwFloodReportInfo getLatestReport(String oneDayBefore);
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/YwFloodReportInfoServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/YwFloodReportInfoServiceImpl.java
index 1f672d9..2bb768b 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/YwFloodReportInfoServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/YwFloodReportInfoServiceImpl.java
@@ -17,7 +17,7 @@
@AllArgsConstructor
public class YwFloodReportInfoServiceImpl extends BaseServiceImpl<YwFloodReportInfoMapper, YwFloodReportInfo> implements IYwFloodReportInfoService {
@Override
- public YwFloodReportInfo getLatestReport(QueryWrapper<YwFloodReportInfo> queryWrapper) {
- return baseMapper.getLatestReport(queryWrapper);
+ public YwFloodReportInfo getLatestReport(String oneDayBefore) {
+ return baseMapper.getLatestReport(oneDayBefore);
}
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/controller/DownTemplateController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/controller/DownTemplateController.java
index 0c4acc0..b57e6ae 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/controller/DownTemplateController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/controller/DownTemplateController.java
@@ -140,8 +140,7 @@
List<TotalInfo> totalOver10List = sjztmdService.getTotalOverInfo(isShow, over10Params);
//昨日报汛内容
- QueryWrapper queryWrapper = new QueryWrapper();
- YwFloodReportInfo ywFloodReportInfo = ywFloodReportInfoService.getLatestReport(queryWrapper);
+ YwFloodReportInfo ywFloodReportInfo = ywFloodReportInfoService.getLatestReport(oneDayBefore.format(formatter2));
byte[] data = null;
if (MyDateUtils.isTodayInFloodSeason()) {
--
Gitblit v1.9.3