From 4b47fde20b6b2c7614bcd98601e03696f3fdf331 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 20 Jun 2023 19:55:50 +0800
Subject: [PATCH] 外呼未接通反馈记录查询修改

---
 skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/vo/CallNotFillRecordVO.java |   18 ++++++++++++++++++
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallNotFillRecordMapper.xml  |   13 ++++++++++++-
 2 files changed, 30 insertions(+), 1 deletions(-)

diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/vo/CallNotFillRecordVO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/vo/CallNotFillRecordVO.java
index ccb9ef9..5b4626b 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/vo/CallNotFillRecordVO.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/vo/CallNotFillRecordVO.java
@@ -11,5 +11,23 @@
  */
 @Data
 public class CallNotFillRecordVO extends CallNotFillRecord {
+	/**
+	 * 水库名称
+	 */
+	private String waterName;
 
+	/**
+	 * 姓名
+	 */
+	private String realName;
+
+	/**
+	 * 呼叫时间
+	 */
+	private String callTime;
+
+	/**
+	 * 用户账号
+	 */
+	private String account;
 }
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallNotFillRecordMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallNotFillRecordMapper.xml
index 6ad1a81..c712d5a 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallNotFillRecordMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallNotFillRecordMapper.xml
@@ -4,8 +4,19 @@
 
     <!--自定义分页列表查询-->
     <select id="selectCallNotFillRecordPage" resultType="cn.gistack.sm.intelligentCall.vo.CallNotFillRecordVO">
-        select * from sm_call_not_fill_record
+        select
+        scnfr.*,
+        arb."name" as waterName,
+        bu.real_name as realName,
+        ctr."gmt_create" as callTime
+        from YWXT.sm_call_not_fill_record scnfr
+        left join SJZT_MD."att_res_base" arb on scnfr.water_guid = arb."code"
+        left join YWXT.blade_user bu on bu.phone = scnfr.tel and bu.is_deleted = 0
+        left join SJZT_ODS."call_task_result" ctr on ctr."call_id" = scnfr.call_id
         where 1=1
+        <if test="callNotFillRecord.account!=null and callNotFillRecord.account!=''">
+            and bu.account = #{callNotFillRecord.account}
+        </if>
         order by id desc
     </select>
 

--
Gitblit v1.9.3