From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/feign/SjztMdClientImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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()) {
--
Gitblit v1.9.3