From 47d87a4cd9ec58d44d93a73d0bf52613566cb261 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 27 Apr 2023 17:41:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 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 04e1210..fe1beab 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
@@ -7,11 +7,11 @@
         select
         ct."id",
         ct."task_name" as taskName,
-        ct."gmt_create" as createTime,
+        date_format(ct."gmt_create",'yyyy-MM-dd HH:mm:ss') as createTime,
         ct."task_status" as taskStatus,
         ctr."calling_number" as callingNumber,
         ctr."callee_number" as calleeNumber,
-        ctr."gmt_create" as executeTime,
+        date_format(ctr."gmt_create",'yyyy-MM-dd HH:mm:ss') as executeTime,
         ctra."callee_number_count" as calleeNumberCount,
         ctra."connection_count" as connectionCount,
         ctra."failure_count" as failureCount,
@@ -46,7 +46,7 @@
         ctr."call_conversation_round" as callConversationRound,
         ctr."call_hangup_direction" as callHangupDirection,
         ctr."call_id" as callId,
-        ctr."gmt_create" as gmtCreate,
+        date_format(ctr."gmt_create",'yyyy-MM-dd HH:mm:ss') as gmtCreate,
         ctr."calling_number" as callingNumber,
         ctr."callee_number" as calleeNumber,
         ctr."task_id" as taskId,

--
Gitblit v1.9.3