From f6f8070ad5b5d370f202d74688c42fe2f7b38682 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 03 May 2023 22:40:26 +0800
Subject: [PATCH] 智能外呼创建,查询导出修改

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.xml |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.xml
index 77664b3..8ffdde3 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.xml
@@ -20,7 +20,7 @@
         left join (select * from "SJZT_ODS"."call_scenes" where "is_deleted" = 0) cs on ct."scene_id" = cs."id"
         left join (select DISTINCT "task_id","calling_number" from "SJZT_ODS"."call_task_result") ctr on ctr."task_id" = ct."id"
         left join "SJZT_ODS"."call_task_result_analyse" ctra on  ctra."task_id" = ct."id"
-        where 1=1
+        where 1=1 and ct."is_deleted" = 0
         <if test="callTask.taskName!=null and callTask.taskName!=''">
             and ct."task_name" like concat(concat('%',#{callTask.taskName}),'%')
         </if>
@@ -73,11 +73,12 @@
         left join
         (
         select "callee_number",
+        "call_id",
         "task_id",
         JSON_VALUE("call_task_callee_content",'$."$水库编码$"') as waterCode,
         JSON_VALUE("call_task_callee_content",'$."$用户名$"') as userName from "SJZT_ODS"."call_task_callee"
         ) ctc
-        on ctr."task_id" = ctc."task_id" and ctr."callee_number" = ctc."callee_number"
+        on ctr."call_id" = ctc."call_id"
         left join "SJZT_MD"."att_res_base" arb on ctc.waterCode = arb."code"
         left join "SJZT_MD"."att_ad_base" aab on aab."guid" = concat(arb."ad_guid",'000000')
         left join

--
Gitblit v1.9.3