From 6cd2da8eb7d7aefecd96a19ebbfe9caba59ea88c Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 18 May 2023 14:25:58 +0800
Subject: [PATCH] 巡查任务巡查责任人完成任务逻辑修改

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/impl/CallServiceImpl.java |   61 +++++++++++++++++++++++++++---
 1 files changed, 54 insertions(+), 7 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 4ddc41d..d329fef 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
@@ -23,6 +23,7 @@
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -73,11 +74,19 @@
 		LocalDateTime now = LocalDateTime.now();
 		String timestamp = now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss SSS"));
 		String transId = generateTransId(now);
-//		String taskName = now.format(DateTimeFormatter.ofPattern("yyyy年MM月dd日HH:mm")) + "智能外呼";
-		String taskName = map.get("taskName").toString();
+		String taskName = now.format(DateTimeFormatter.ofPattern("yyyy年MM月dd日HH:mm")) + "智能外呼";;
+		if(null!= map.get("taskName") && !map.get("taskName").equals("")){
+			taskName = map.get("taskName").toString();
+		}
 		String[] numbers = StringUtils.split(callingNumbers,",");
-//		String taskScheduleTime = LocalDateTime.now().plusHours(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-		String taskScheduleTime = map.get("taskScheduleTime").toString();
+		String taskScheduleTime = LocalDateTime.now().plusHours(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+		if (null!=map.get("taskScheduleTime") && !map.get("taskScheduleTime").equals("")){
+			taskScheduleTime = map.get("taskScheduleTime").toString();
+		}
+		String scenesIds = scenesId;
+		if (null!=map.get("scenesId") && !map.get("scenesId").equals("")){
+			scenesIds = map.get("scenesId").toString();
+		}
 		JSONArray arr = getCalleeInfo(params);
 		HttpHeaders httpHeaders = new HttpHeaders();
 		httpHeaders.add("Content-Type", CONTENT_TYPE);
@@ -85,7 +94,7 @@
 		httpHeaders.add("Accept-Encoding", ACCEPT_ENCODING);
 		JSONObject paramJson = new JSONObject();
 		paramJson.put("taskName", taskName);
-		paramJson.put("scenesId", scenesId);
+		paramJson.put("scenesId", scenesIds);
 		paramJson.put("callingNumbers", numbers);
 		paramJson.put("taskScheduleTime", taskScheduleTime);
 		paramJson.put("calleeData", arr);
@@ -216,7 +225,7 @@
 			// 查询所有下级区域code
 			list = getAllChildrenAreaByAreaCode(callTaskResult.getAreaName());
 		}
-		List<CallTaskResultVO> resultListPage = callTaskMapper.getCallTaskResultListPage(page, callTaskResult,list);
+		List<CallTaskResultVO> resultListPage = callTaskMapper.getCallTaskResultListPage(page, callTaskResult,list,null);
 		return page.setRecords(resultListPage);
 	}
 
@@ -228,16 +237,54 @@
 	@Override
 	public Object getCallTaskResultList(CallTaskResultVO callTaskResult) {
 		List<String> list = new ArrayList<>();
+		List<String> idsList = new ArrayList<>();
 		if (null!= callTaskResult.getAreaName() && !callTaskResult.getAreaName().equals("")){
 			// 查询所有下级区域code
 			list = getAllChildrenAreaByAreaCode(callTaskResult.getAreaName());
 		}
-		List<CallTaskResultVO> resultListPage = callTaskMapper.getCallTaskResultListPage(null, callTaskResult,list);
+		if (null!= callTaskResult.getIds() && !callTaskResult.getIds().equals("")){
+			// 查询所有下级区域code
+			idsList = Arrays.asList(callTaskResult.getIds().split(","));
+		}
+		List<CallTaskResultVO> resultListPage = callTaskMapper.getCallTaskResultListPage(null, callTaskResult,list,idsList);
 		// 返回
 		return resultListPage;
 	}
 
 	/**
+	 * 查询智能外呼统计数据-按日期-行政区统计
+	 * @param callTaskStatistic
+	 * @return
+	 */
+	@Override
+	public Object getOutgoingStatisticList(IPage<CallTaskStatistic> page,CallTaskStatistic callTaskStatistic) {
+		List<String> list = new ArrayList<>();
+		if (null!= callTaskStatistic.getAdName() && !callTaskStatistic.getAdName().equals("")){
+			// 查询所有下级区域code
+			list = getAllChildrenAreaByAreaCode(callTaskStatistic.getAdName());
+		}
+		// 勾选导出行政区 id 组装
+		if (null!= callTaskStatistic.getIds() && !callTaskStatistic.getIds().equals("")){
+			list = Arrays.asList(callTaskStatistic.getIds().split(","));
+		}
+		// 判断是否分页
+		if (null!= callTaskStatistic.getIsPage()){
+			return callTaskMapper.getOutgoingStatisticList(null,callTaskStatistic,list);
+		}
+		return page.setRecords(callTaskMapper.getOutgoingStatisticList(page,callTaskStatistic,list));
+	}
+
+	/**
+	 * 查询智能外呼统计数据-行政区统计
+	 * @param callTaskStatistic
+	 * @return
+	 */
+	@Override
+	public Object getOutgoingStatisticByArea(CallTaskStatistic callTaskStatistic) {
+		return callTaskMapper.getOutgoingStatisticByArea(callTaskStatistic);
+	}
+
+	/**
 	 * 查询所有下级区域
 	 * @param areaCode
 	 * @return

--
Gitblit v1.9.3