From bf9b1f3720eba0dffa578d9d4b61e308ee9795ef Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Thu, 27 Jun 2024 13:46:17 +0800
Subject: [PATCH] 解决每日报讯导出异常

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/OverWord.java                       |    4 ++++
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/controller/DownTemplateController.java |    5 +++--
 2 files changed, 7 insertions(+), 2 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 6a87c05..aa48cfb 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
@@ -112,9 +112,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<>();
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/OverWord.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/OverWord.java
index 709c987..fd6d4a8 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/OverWord.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/OverWord.java
@@ -71,6 +71,10 @@
 		int jtCount = 0; //接通的数量
 		for (CallTaskResultVO callTaskResultVO : whtjList) {
 
+			if(null == callTaskResultVO.getId()) {
+				continue;
+			}
+
 			if (StringUtil.isNotBlank(callTaskResultVO.getCityName())) {
 				if (StringUtil.isBlank(cityNames)) {
 					cityNames = cityNames + callTaskResultVO.getCityName();

--
Gitblit v1.9.3