From d2f2faf246d45c7bbb0daccbbe005fab4597eb86 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 28 Apr 2023 00:30:29 +0800
Subject: [PATCH] 智能通话查修改,导出修改

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/impl/CallServiceImpl.java |   32 ++++++++++++++++++--------------
 1 files changed, 18 insertions(+), 14 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 9783eb4..568f5d5 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
@@ -213,27 +213,31 @@
 	public IPage<CallTaskResultVO> getCallTaskResultListPage(IPage<CallTaskResultVO> page, CallTaskResultVO callTaskResult) {
 		List<String> list = new ArrayList<>();
 		if (null!= callTaskResult.getAreaName() && !callTaskResult.getAreaName().equals("")){
-			// 查询水库名称
+			// 查询所有下级区域code
 			list = getWaterNameByAreaCode(callTaskResult.getAreaName());
 		}
 		List<CallTaskResultVO> resultListPage = callTaskMapper.getCallTaskResultListPage(page, callTaskResult,list);
-		//遍历
-		if (resultListPage.size()>0) {
-			for (CallTaskResultVO resultVO : resultListPage) {
-				// 取出 jsonData 数据
-				String callTaskCalleeContent = resultVO.getCallTaskCalleeContent();
-				JSONObject jsonObject = JSONObject.parseObject(callTaskCalleeContent);
-				String userName = jsonObject.getString("$用户名$");
-				String adName = jsonObject.getString("$水库名称$");
-				resultVO.setAdName(adName);
-				resultVO.setAreaName(getAreaNameByAdCode(jsonObject.getString("$水库编码$")));
-				resultVO.setUserName(userName);
-			}
-		}
 		return page.setRecords(resultListPage);
 	}
 
 	/**
+	 * 导出呼叫详情列表信息
+	 * @param callTaskResult
+	 * @return
+	 */
+	@Override
+	public Object getCallTaskResultList(CallTaskResultVO callTaskResult) {
+		List<String> list = new ArrayList<>();
+		if (null!= callTaskResult.getAreaName() && !callTaskResult.getAreaName().equals("")){
+			// 查询所有下级区域code
+			list = getWaterNameByAreaCode(callTaskResult.getAreaName());
+		}
+		List<CallTaskResultVO> resultListPage = callTaskMapper.getCallTaskResultListPage(null, callTaskResult,list);
+		// 返回
+		return resultListPage;
+	}
+
+	/**
 	 * 通过水库编码获取行政区名称
 	 * @param adCode
 	 * @return

--
Gitblit v1.9.3