From a929d99e6b90e426a5e1bd2eee1d8820986b6c61 Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Tue, 25 Jun 2024 14:06:07 +0800
Subject: [PATCH] 智能外呼详情查询新增测试,水尺监测新增图片标记并上传

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/impl/CallServiceImpl.java |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/impl/CallServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/impl/CallServiceImpl.java
index f9b29bc..e779030 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/impl/CallServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/impl/CallServiceImpl.java
@@ -504,7 +504,10 @@
 		callTaskStatistic.setThreeNoConnectCount(totalThreeNoConnectCount);
 //		callTaskStatistic.setTwoNoConnectCount(totalTwoNoConnectCount);
 		callTaskStatistic.setRefuseConnectCount(totalRefuseConnectCount);
-		callTaskStatistic.setCreateTime(callTaskStatistics.get(0).getCreateTime());
+		if(callTaskStatistics.size() > 0) {
+			callTaskStatistic.setCreateTime(callTaskStatistics.get(0).getCreateTime());
+		}
+
 		// 查询当前行政区名称
 		AttAdBase attAdBase = new AttAdBase();
 		attAdBase.setGuid(callTaskStatisticEntity.getAdCode());
@@ -516,7 +519,11 @@
 		// 计算比例
 		//格式化小数
 		DecimalFormat df = new DecimalFormat("0.00");
-		callTaskStatistic.setCallCompletingRate(df.format((float)totalConnectionCount/totalCalleeNumberCount*100));
+		if (totalCalleeNumberCount == 0){
+			callTaskStatistic.setCallCompletingRate("0");
+		}else{
+			callTaskStatistic.setCallCompletingRate(df.format((float)totalConnectionCount/totalCalleeNumberCount*100));
+		}
 		statistics.add(callTaskStatistic);
 		// 返回
 		return statistics;
@@ -1249,7 +1256,7 @@
 		params.put("list",setForListMap(personList));
 		// 调度时间处理
 		if (null!=time && !time.equals("")){
-			params.put("taskScheduleTime",new SimpleDateFormat("yyyy-MM-dd").format(new Date())+ " " + time + ":00");
+			params.put("taskScheduleTime",time);
 		}else {
 			params.put("taskScheduleTime",new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
 		}
@@ -1264,4 +1271,12 @@
 		// 返回
 		return R.data(400,errorMsg,null);
 	}
+
+	/**
+	 * 测试接口-调用外呼库查询任务详情信息
+	 */
+	@Override
+	public Object getTaskDetail(Integer taskId) {
+		return callTaskMapper.getTaskDetail(taskId);
+	}
 }

--
Gitblit v1.9.3