From 314aeb39f049f26d02611d8a426a2322c7ccfac0 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 18 May 2023 21:11:33 +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 | 126 +++++++++++++++++++++++++++++++----------
1 files changed, 95 insertions(+), 31 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 d3bb875..59dfbb6 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
@@ -145,48 +145,103 @@
CONNECT BY PRIOR "ad_code" = "p_ad_code"
</select>
+<!-- <!–查询智能外呼统计数据-按日期-行政区统计–>-->
+<!-- <select id="getOutgoingStatisticList" resultType="cn.gistack.sm.intelligentCall.vo.CallTaskStatistic">-->
+<!-- select a.*,round(a.connectionCount/a.calleeNumberCount*100,2) callCompletingRate from-->
+<!-- (-->
+<!-- select-->
+<!-- count(*) as calleeNumberCount,-->
+<!-- ifnull(sum(case when ctr."call_result"='200000' then 1 else 0 end),0) as connectionCount,-->
+<!-- DATE_FORMAT(ctr."gmt_create",'%Y-%m-%d') as createTime,-->
+<!-- aab."ad_name" as adName,-->
+<!-- aab."guid"-->
+<!-- from "SJZT_ODS"."call_task_result" ctr-->
+<!-- left join-->
+<!-- (-->
+<!-- select "call_id","task_id",JSON_VALUE("call_task_callee_content",'$."$水库编码$"') as waterCode from "SJZT_ODS"."call_task_callee"-->
+<!-- ) ctc 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')-->
+<!-- where 1=1 and aab."ad_name" is not null-->
+<!-- <if test="callTaskStatistic.startTime!=null and callTaskStatistic.startTime!=''">-->
+<!-- and date_format(ctr."gmt_create",'%Y-%m-%d') >= #{callTaskStatistic.startTime}-->
+<!-- </if>-->
+<!-- <if test="callTaskStatistic.endTime!=null and callTaskStatistic.endTime!=''">-->
+<!-- and date_format(ctr."gmt_create",'%Y-%m-%d') <= #{callTaskStatistic.endTime}-->
+<!-- </if>-->
+<!-- <if test="list != null and list.size()>0">-->
+<!-- and aab."ad_code" in-->
+<!-- <foreach collection="list" item="adCode" separator ="," open="(" close=")">-->
+<!-- #{adCode}-->
+<!-- </foreach>-->
+<!-- </if>-->
+<!-- group by DATE_FORMAT(ctr."gmt_create",'%Y-%m-%d'),aab."ad_name",aab."guid"-->
+<!-- ) a-->
+<!-- order by createTime desc,callCompletingRate desc-->
+<!-- </select> -->
+
<!--查询智能外呼统计数据-按日期-行政区统计-->
<select id="getOutgoingStatisticList" resultType="cn.gistack.sm.intelligentCall.vo.CallTaskStatistic">
- select a.*,round(a.connectionCount/a.calleeNumberCount*100,2) callCompletingRate from
- (
- select
- count(*) as calleeNumberCount,
- ifnull(sum(case when ctr."call_result"='200000' then 1 else 0 end),0) as connectionCount,
- DATE_FORMAT(ctr."gmt_create",'%Y-%m-%d') as createTime,
+ select
+ b.*,
+ case when b.calleeNumberCount>0 then round(b.connectionCount/b.calleeNumberCount*100,2) else 0 end callCompletingRate
+ from (
+ select aab."guid",
aab."ad_name" as adName,
- aab."guid"
- from "SJZT_ODS"."call_task_result" ctr
- left join
- (
- select "call_id","task_id",JSON_VALUE("call_task_callee_content",'$."$水库编码$"') as waterCode from "SJZT_ODS"."call_task_callee"
- ) ctc 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')
- where 1=1 and aab."ad_name" is not null
- <if test="callTaskStatistic.startTime!=null and callTaskStatistic.startTime!=''">
- and date_format(ctr."gmt_create",'%Y-%m-%d') >= #{callTaskStatistic.startTime}
+ createTime,
+ ifnull(sum(totalCount),0) calleeNumberCount,
+ ifnull(sum(connectCount),0) connectionCount
+ from SJZT_MD."att_ad_base" aab
+ left join (
+ select
+ count(*) as totalCount,
+ ifnull(sum(case when ctr."call_result"='200000' then 1 else 0 end),0) as connectCount,
+ DATE_FORMAT(ctr."gmt_create",'%Y-%m-%d') as createTime,
+ aab."guid",
+ aab."ad_grad",
+ aab."p_ad_code",
+ aab."ad_name" as adName
+ from "SJZT_ODS"."call_task_result" ctr
+ left join
+ (
+ select "call_id","task_id",JSON_VALUE("call_task_callee_content",'$."$水库编码$"') as waterCode from "SJZT_ODS"."call_task_callee"
+ ) ctc 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')
+ where 1=1 and aab."ad_name" is not null
+ <if test="callTaskStatistic.createTime!=null and callTaskStatistic.createTime!=''">
+ and date_format(ctr."gmt_create",'%Y-%m-%d') = #{callTaskStatistic.createTime}
+ </if>
+ <if test="callTaskStatistic.startTime!=null and callTaskStatistic.startTime!=''">
+ and date_format(ctr."gmt_create",'%Y-%m-%d') >= #{callTaskStatistic.startTime}
+ </if>
+ <if test="callTaskStatistic.endTime!=null and callTaskStatistic.endTime!=''">
+ and date_format(ctr."gmt_create",'%Y-%m-%d') <= #{callTaskStatistic.endTime}
+ </if>
+ group by DATE_FORMAT(ctr."gmt_create",'%Y-%m-%d'),aab."ad_name",aab."guid",aab."ad_grad",aab."p_ad_code"
+ ) a
+ <if test="callTaskStatistic.grad==1">
+ on aab."guid" = a."p_ad_code" where aab."p_ad_code" = #{callTaskStatistic.adCode}
</if>
- <if test="callTaskStatistic.endTime!=null and callTaskStatistic.endTime!=''">
- and date_format(ctr."gmt_create",'%Y-%m-%d') <= #{callTaskStatistic.endTime}
+ <if test="callTaskStatistic.grad==2">
+ on aab."guid" = a."guid" where aab."p_ad_code" = #{callTaskStatistic.adCode}
</if>
- <if test="list != null and list.size()>0">
- and aab."ad_code" in
- <foreach collection="list" item="adCode" separator ="," open="(" close=")">
- #{adCode}
- </foreach>
+ <if test="callTaskStatistic.grad==3">
+ on aab."guid" = a."guid" where aab."ad_code" = #{callTaskStatistic.adCode}
</if>
- group by DATE_FORMAT(ctr."gmt_create",'%Y-%m-%d'),aab."ad_name",aab."guid"
- ) a
- order by createTime desc,callCompletingRate desc
+ group by createTime,aab."ad_name",aab."guid"
+ order by aab."guid"
+ ) b
</select>
<!--查询智能外呼统计数据-行政区统计-->
<select id="getOutgoingStatisticByArea" resultType="cn.gistack.sm.intelligentCall.vo.CallTaskStatistic">
- select b.*,case when b.totalCount>0 then round(b.connectCount/b.totalCount*100,2) else 0 end callCompletingRate from(
+ select b.*,case when b.connectionCount>0 then round(b.connectionCount/b.calleeNumberCount*100,2) else 0 end callCompletingRate from(
select aab."guid",
aab."ad_name" as adName,
- ifnull(sum(totalCount),0) totalCount,
- ifnull(sum(connectCount),0) connectCount
+ createTime,
+ ifnull(sum(totalCount),0) calleeNumberCount,
+ ifnull(sum(connectCount),0) connectionCount
from SJZT_MD."att_ad_base" aab
left join (
select
@@ -208,6 +263,12 @@
<if test="callTaskStatistic.createTime!=null and callTaskStatistic.createTime!=''">
and date_format(ctr."gmt_create",'%Y-%m-%d') = #{callTaskStatistic.createTime}
</if>
+ <if test="callTaskStatistic.startTime!=null and callTaskStatistic.startTime!=''">
+ and date_format(ctr."gmt_create",'%Y-%m-%d') >= #{callTaskStatistic.startTime}
+ </if>
+ <if test="callTaskStatistic.endTime!=null and callTaskStatistic.endTime!=''">
+ and date_format(ctr."gmt_create",'%Y-%m-%d') <= #{callTaskStatistic.endTime}
+ </if>
group by DATE_FORMAT(ctr."gmt_create",'%Y-%m-%d'),aab."ad_name",aab."guid",aab."ad_grad",aab."p_ad_code"
) a
<if test="callTaskStatistic.grad==1">
@@ -216,7 +277,10 @@
<if test="callTaskStatistic.grad==2">
on aab."guid" = a."guid" where aab."p_ad_code" = #{callTaskStatistic.adCode}
</if>
- group by aab."ad_name",aab."guid"
+ <if test="callTaskStatistic.grad==3">
+ on aab."guid" = a."guid" where aab."ad_code" = #{callTaskStatistic.adCode}
+ </if>
+ group by createTime,aab."ad_name",aab."guid"
order by aab."guid"
) b
</select>
--
Gitblit v1.9.3