From cc1efbaded12b76f39699911ba0f032d14e8d24e Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 05 May 2023 16:34:26 +0800
Subject: [PATCH] 智能外呼导出查询修改

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.xml |   11 +++++++++--
 1 files changed, 9 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 8ffdde3..6625f71 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
@@ -28,10 +28,10 @@
             and ct."task_status" = #{callTask.taskStatus}
         </if>
         <if test="callTask.startTime!=null and callTask.startTime!=''">
-            and date_format(ct."gmt_create",'%Y-%m-%d') >= #{callTask.startTime}
+            and date_format(ct."task_schedule_time",'%Y-%m-%d') >= #{callTask.startTime}
         </if>
         <if test="callTask.endTime!=null and callTask.endTime!=''">
-            and date_format(ct."gmt_create",'%Y-%m-%d') &lt;= #{callTask.endTime}
+            and date_format(ct."task_schedule_time",'%Y-%m-%d') &lt;= #{callTask.endTime}
         </if>
         order by ct."gmt_create" desc
     </select>
@@ -88,6 +88,7 @@
         GROUP BY ctra."call_id"
         ) cas
         on cas."call_id" = ctr."call_id"
+        left join "SJZT_ODS"."call_task" ct on ct."id" = ctr."task_id"
         where 1=1
         <if test="callTaskResult.taskId!=null and callTaskResult.taskId!=''">
             and ctr."task_id" = #{callTaskResult.taskId}
@@ -104,6 +105,12 @@
         <if test="callTaskResult.userName!=null and callTaskResult.userName!=''">
             and ctc.userName like concat('%',#{callTaskResult.userName},'%')
         </if>
+        <if test="callTaskResult.taskName!=null and callTaskResult.taskName!=''">
+            and ct."task_name" like concat(concat('%',#{callTaskResult.taskName}),'%')
+        </if>
+        <if test="callTaskResult.taskStatus!=null">
+            and ct."task_status" = #{callTaskResult.taskStatus}
+        </if>
         <if test="callTaskResult.startTime!=null and callTaskResult.startTime!=''">
             and date_format(ctr."gmt_create",'%Y-%m-%d') >= #{callTaskResult.startTime}
         </if>

--
Gitblit v1.9.3