From 41a83e40f815a01bfe314538c06f285e7085eed5 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Thu, 20 Jun 2024 09:23:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/controller/DownTemplateController.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
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 6c55c92..6a87c05 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
@@ -4,6 +4,8 @@
import cn.gistack.alerts.sms.feign.ISmsRecordClient;
import cn.gistack.alerts.sms.vo.SmsResultVO;
+import cn.gistack.sm.intelligentCall.service.CallService;
+import cn.gistack.sm.intelligentCall.vo.CallTaskResultVO;
import cn.gistack.sm.sjztmd.util.MyDateUtils;
import cn.gistack.sm.sjztmd.word.service.ISjztmdService;
import cn.gistack.sm.sjztmd.word.util.BriefReportUtil;
@@ -14,6 +16,7 @@
import io.swagger.annotations.Api;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springframework.core.io.InputStreamResource;
@@ -29,6 +32,7 @@
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.HashMap;
@@ -51,6 +55,8 @@
private final ISjztmdService sjztmdService;
private final ISmsRecordClient smsRecordClient;
+
+ private final CallService callService;
@GetMapping(value = "/getBriefReport")
public R getBriefReport() {
//获取总览、大中库、明细数据
@@ -92,17 +98,24 @@
//短信预警数量
SmsResultVO vo = new SmsResultVO();
// 获取当前日期
- LocalDate today = LocalDate.now();
+ LocalDateTime now = LocalDateTime.now();
// 获取前一天日期
- LocalDate yesterday = today.minusDays(1);
+ LocalDateTime oneDayBefore = now.minusDays(1);
// 格式化日期并打印
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
- vo.setStartTime(yesterday.format(formatter));
- vo.setEndTime(yesterday.format(formatter));
+ // 定义日期时间格式，包含年-月-日 时:分:秒
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ vo.setStartTime(oneDayBefore.format(formatter));
+ vo.setEndTime(now.format(formatter));
vo.setSmsType("2");
vo.setResCode("0");
vo.setIsExport(1);
List<SmsResultVO> dxyjList = smsRecordClient.smsSuccessList(vo);
+
+ //外呼统计
+ CallTaskResultVO callTaskResult = new CallTaskResultVO();
+ callTaskResult.setStartTime(oneDayBefore.format(formatter));
+ callTaskResult.setEndTime(now.format(formatter));
+ List<CallTaskResultVO> whtjList = (List<CallTaskResultVO>) callService.getCallResultListTemp(null,callTaskResult);
HashMap<String,String> over10Params = new HashMap<>();
//small_start_stag=0&small_end_stag=2&mid_start_stag=0&mid_end_stag=2&big_start_stag=0&big_end_stag=2
@@ -121,7 +134,7 @@
List<TotalInfo> totalOver10List = sjztmdService.getTotalOverInfo(isShow,over10Params);
byte[] data = null;
if (MyDateUtils.isTodayInFloodSeason()){
- data = WordUtil.GetOverInfo(totalList,dzkList,overDetailList,szInfoList,dxyjList);
+ data = WordUtil.GetOverInfo(totalList,dzkList,overDetailList,szInfoList,dxyjList,whtjList);
}else {
data= WordUtil.GetNotInSeasonOverInfo(totalList,dzkList,overDetailList,szInfoList,totalOverList,totalOver10List);
--
Gitblit v1.9.3