From 64881c98f373304b32beca2f6b0aae7fdc065712 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 08 May 2023 11:21:50 +0800
Subject: [PATCH] 任务导出查询修改，新增按任务id查询导出
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/impl/CallServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 3fce98d..9ad7a0d 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;
@@ -224,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);
}
@@ -236,11 +237,16 @@
@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;
}
--
Gitblit v1.9.3