zhongrj
2023-07-05 a7c5b11f4db54f95845b14c1105fa4b962fa9f3a
智能外呼统计查询修改
6 files modified
513 ■■■■ changed files
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/vo/CallTaskStatistic.java 10 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/controller/CallController.java 12 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.java 17 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.xml 316 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/CallService.java 8 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/impl/CallServiceImpl.java 150 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/vo/CallTaskStatistic.java
@@ -173,4 +173,14 @@
     * 县名称
     */
    private String countyName;
    /**
     * 是否短信反馈
     */
    private String isSmsFill;
    /**
     * 呼叫结果
     */
    private String callResult;
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/controller/CallController.java
@@ -153,4 +153,16 @@
        // 返回
        return R.data(callService.getCallNotConnectResultList(Condition.getPage(query),callTaskStatistic));
    }
    /**
     * 按日期行政区呼叫结果详情列表信息
     * @param callTaskStatistic
     * @param query
     * @return
     */
    @GetMapping("/getCallResultList")
    public R getCallResultList(CallTaskStatistic callTaskStatistic, Query query){
        // 返回
        return R.data(callService.getCallResultList(Condition.getPage(query),callTaskStatistic));
    }
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.java
@@ -160,4 +160,21 @@
     */
    @DS("znwh")
    List<Scene> getCallNotConnectListByTaskId(@Param("taskId") String taskId);
    /**
     * 查询当前天除去日常呼叫外的统计数据
     * @param callTaskStatistic
     * @return
     */
    List<CallTaskStatistic> getNoDayOutgoingStatisticList(@Param("callTaskStatistic") CallTaskStatistic callTaskStatistic);
    /**
     * 按日期行政区呼叫结果详情列表信息
     * @param callTaskStatistic (count 1:查所有被叫号码  2:查接通号码  3:查未接通号码  4:查拒接号码)
     * @param page
     * @return
     */
    List<CallTaskStatistic> getCallResultList(@Param("page") IPage<CallTaskStatistic> page,
                                              @Param("list") List<String> list,
                                              @Param("callTaskStatistic") CallTaskStatistic callTaskStatistic);
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.xml
@@ -201,59 +201,138 @@
    <!--查询智能外呼统计数据-按日期-行政区统计-->
    <select id="getOutgoingStatisticList" resultType="cn.gistack.sm.intelligentCall.vo.CallTaskStatistic">
        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,
            createTime,
            ifnull(sum(totalCount),0) calleeNumberCount,
            ifnull(sum(connectCount),0) + ifnull(sum(isSmsFillCount),0) connectionCount
            from SJZT_MD."att_ad_base"  aab
        select  aab."guid",
        aab."ad_name" as adName,
        createTime,
        ifnull(sum(totalCount),0) calleeNumberCount,
        ifnull(sum(connectCount),0) + ifnull(sum(connectCount1),0) + ifnull(sum(connectCount2),0) + ifnull(sum(isSmsFillCount),0) as connectionCount,
        ifnull(sum(resConnectCount1),0) - ifnull(sum(resConnectCount2),0) refuseConnectCount,
        ifnull(sum(twoNotConnectCount),0) twoNoConnectCount,
        ifnull(sum(threeNotConnectCount),0) - ifnull(sum(threeNotConnectCount1),0) threeNoConnectCount
        from SJZT_MD."att_ad_base"  aab
        left join (
            select
            ifnull(sum(case when ctc1."call_result"!='' then 1 else 0 end),0) as totalCount,
            ifnull(sum(case when ctc1."call_result"='200000' then 1 else 0 end),0) as connectCount,
            ifnull(sum(case when ctc2."call_result"='200000' then 1 else 0 end),0) as connectCount1,
            ifnull(sum(case when ctc3."call_result"='200000' then 1 else 0 end),0) as connectCount2,
            ifnull(sum(case when ctc3.task_id!='' then 1 else 0 end),0) as isSmsFillCount,
            ifnull(sum(case when ctc2."call_result"='200003' then 1 else 0 end),0) as twoNotConnectCount,
            ifnull(sum(case when ctc3."call_result"='200003' then 1 else 0 end),0) as threeNotConnectCount,
            ifnull(sum(case when ctc3.task_id!='' and ctc3."call_result"='200003' then 1 else 0 end),0) as threeNotConnectCount1,
            ifnull(sum(case when ctc3."call_result"='200005' then 1 else 0 end),0) as resConnectCount1,
            ifnull(sum(case when ctc3.task_id!='' and ctc3."call_result"='200005' then 1 else 0 end),0) as resConnectCount2,
            DATE_FORMAT(ctc1."gmt_create",'%Y-%m-%d') as createTime,
            aab."guid",
            aab."ad_grad",
            aab."p_ad_code",
            aab."ad_name" as adName
            from
            (
            select ctc."gmt_create",ctc."call_id",ctc."task_id",JSON_VALUE(ctc."call_task_callee_content",'$."$水库编码$"') as waterCode,ctr."call_result" from "SJZT_ODS"."call_task_callee" ctc
            left join SJZT_ODS."call_task" ct on ct."id" = ctc."task_id"
            left join SJZT_ODS."call_task_result" ctr on ctr."call_id" = ctc."call_id"
            left join YWXT.sm_daily_call_task sdct on sdct.task_id = ct."id"
            where date_format(ct."task_schedule_time",'%Y-%m-%d') = #{callTaskStatistic.createTime} and sdct.type ='1'
            ) ctc1
            left join (
                select
                count(*) as totalCount,
                ifnull(sum(case when ctr."call_result"='200000' then 1 else 0 end),0) as connectCount,
                ifnull(sum(case when scnfr.task_id!='' then 1 else 0 end),0)as isSmsFillCount,
                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')
                left join "YWXT".sm_call_not_fill_record scnfr on scnfr.call_id = ctr."call_id"
                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') &lt;= #{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}
            select ctc."gmt_create",ctc."call_id",ctc."task_id",JSON_VALUE(ctc."call_task_callee_content",'$."$水库编码$"') as waterCode,ctr."call_result" from "SJZT_ODS"."call_task_callee" ctc
            left join SJZT_ODS."call_task" ct on ct."id" = ctc."task_id"
            left join SJZT_ODS."call_task_result" ctr on ctr."call_id" = ctc."call_id"
            left join YWXT.sm_daily_call_task sdct on sdct.task_id = ct."id"
            where date_format(ct."task_schedule_time",'%Y-%m-%d') = #{callTaskStatistic.createTime} and sdct.type ='2'
            ) ctc2 on ctc1.waterCode= ctc2.waterCode
            left join (
            select ctc."gmt_create",ctc."call_id",ctc."task_id",JSON_VALUE(ctc."call_task_callee_content",'$."$水库编码$"') as waterCode,ctr."call_result",scnfr.task_id from "SJZT_ODS"."call_task_callee" ctc
            left join SJZT_ODS."call_task" ct on ct."id" = ctc."task_id"
            left join SJZT_ODS."call_task_result" ctr on ctr."call_id" = ctc."call_id"
            left join "YWXT".sm_call_not_fill_record scnfr on scnfr.call_id = ctr."call_id"
            left join YWXT.sm_daily_call_task sdct on sdct.task_id = ct."id"
            where date_format(ct."task_schedule_time",'%Y-%m-%d') = #{callTaskStatistic.createTime} and sdct.type ='3'
            ) ctc3 on ctc1.waterCode= ctc3.waterCode
            left join "SJZT_MD"."att_res_base" arb on ctc1.waterCode = arb."code"
            left join "SJZT_MD"."att_ad_base" aab on aab."guid" = concat(arb."ad_guid",'000000') or aab."guid" = arb."interior_ad_guid"
            where 1=1 and aab."ad_name" is not null
            <if test="callTaskStatistic.createTime!=null and callTaskStatistic.createTime!=''">
                and date_format(ctc1."gmt_create",'%Y-%m-%d') = #{callTaskStatistic.createTime}
            </if>
            <if test="callTaskStatistic.grad==2">
                on aab."guid" = a."guid" where aab."p_ad_code" = #{callTaskStatistic.adCode}
            <if test="callTaskStatistic.startTime!=null and callTaskStatistic.startTime!=''">
                and date_format(ctc1."gmt_create",'%Y-%m-%d') >= #{callTaskStatistic.startTime}
            </if>
            <if test="callTaskStatistic.grad==3">
                on aab."guid" = a."guid" where aab."ad_code" = #{callTaskStatistic.adCode}
            <if test="callTaskStatistic.endTime!=null and callTaskStatistic.endTime!=''">
                and date_format(ctc1."gmt_create",'%Y-%m-%d') &lt;= #{callTaskStatistic.endTime}
            </if>
            group by createTime,aab."ad_name",aab."guid"
            order by aab."guid"
        ) b
            group by DATE_FORMAT(ctc1."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.grad==2">
            on aab."guid" = a."guid" where aab."p_ad_code" = #{callTaskStatistic.adCode}
        </if>
        <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"
    </select>
<!--    &lt;!&ndash;查询智能外呼统计数据-按日期-行政区统计&ndash;&gt;-->
<!--    <select id="getOutgoingStatisticList" resultType="cn.gistack.sm.intelligentCall.vo.CallTaskStatistic">-->
<!--        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,-->
<!--            createTime,-->
<!--            ifnull(sum(totalCount),0) calleeNumberCount,-->
<!--            ifnull(sum(connectCount),0) + ifnull(sum(isSmsFillCount),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,-->
<!--                ifnull(sum(case when scnfr.task_id!='' then 1 else 0 end),0)as isSmsFillCount,-->
<!--                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')-->
<!--                left join "YWXT".sm_call_not_fill_record scnfr on scnfr.call_id = ctr."call_id"-->
<!--                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') &lt;= #{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.grad==2">-->
<!--                on aab."guid" = a."guid" where aab."p_ad_code" = #{callTaskStatistic.adCode}-->
<!--            </if>-->
<!--            <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>-->
    <!--查询智能外呼统计数据-行政区统计-->
    <select id="getOutgoingStatisticByArea" resultType="cn.gistack.sm.intelligentCall.vo.CallTaskStatistic">
@@ -456,4 +535,145 @@
        and ctc.call_status = 4 and ctr.call_result!='200000' and ctc.task_id = #{taskId}
    </select>
    <!--查询当前天除去日常呼叫外的统计数据-->
    <select id="getNoDayOutgoingStatisticList" resultType="cn.gistack.sm.intelligentCall.vo.CallTaskStatistic">
        select  aab."guid",
        aab."ad_name" as adName,
        createTime,
        ifnull(sum(totalCount),0) calleeNumberCount,
        ifnull(sum(connectCount),0) + ifnull(sum(isSmsFillCount),0) as connectionCount,
        ifnull(sum(resConnectCount1),0) - ifnull(sum(resConnectCount2),0) refuseConnectCount
        from SJZT_MD."att_ad_base"  aab
        left join (
            select
            ifnull(sum(case when ctc."call_result"!='' then 1 else 0 end),0) as totalCount,
            ifnull(sum(case when ctc."call_result"='200000' then 1 else 0 end),0) as connectCount,
            ifnull(sum(case when ctc.task_id!='' then 1 else 0 end),0)as isSmsFillCount,
            ifnull(sum(case when ctc."call_result"='200005' then 1 else 0 end),0) as resConnectCount1,
            ifnull(sum(case when ctc.task_id!='' and ctc."call_result"='200005' then 1 else 0 end),0) as resConnectCount2,
            DATE_FORMAT(ctc."gmt_create",'%Y-%m-%d') as createTime,
            aab."guid",
            aab."ad_grad",
            aab."p_ad_code",
            aab."ad_name" as adName
            from
            (
            select ctc."gmt_create",ctc."call_id",ctc."task_id",JSON_VALUE(ctc."call_task_callee_content",'$."$水库编码$"') as waterCode,ctr."call_result",scnfr.task_id from "SJZT_ODS"."call_task_callee" ctc
            left join SJZT_ODS."call_task" ct on ct."id" = ctc."task_id"
            left join SJZT_ODS."call_task_result" ctr on ctr."call_id" = ctc."call_id"
            left join "YWXT".sm_call_not_fill_record scnfr on scnfr.call_id = ctr."call_id"
            left join YWXT.sm_daily_call_task sdct on sdct.task_id = ct."id"
            where 1=1
            and sdct.type!='1' and sdct.type!='2' and sdct.type!='3'
            <if test="callTaskStatistic.createTime!=null and callTaskStatistic.createTime!=''">
                and date_format(ctc."gmt_create",'%Y-%m-%d') = #{callTaskStatistic.createTime}
            </if>
            ) ctc
            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') or aab."guid" = arb."interior_ad_guid"
            where 1=1 and aab."ad_name" is not null
            group by DATE_FORMAT(ctc."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.grad==2">
            on aab."guid" = a."guid" where aab."p_ad_code" = #{callTaskStatistic.adCode}
        </if>
        <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"
    </select>
    <!--按日期行政区呼叫结果详情列表信息-->
    <select id="getCallResultList" resultType="cn.gistack.sm.intelligentCall.vo.CallTaskStatistic">
        select
        a.*,
        aab."guid",aab."ad_grad",aab."p_ad_code",aab."ad_name" as adName,
        bu.real_name as realName,
        if(ifnull(scnfr.call_id,0)='0','','已反馈') isSmsFill,
        REGEXP_SUBSTR (arb."res_loc",'[^-]+',1,2) as cityName,
        REGEXP_SUBSTR (arb."res_loc",'[^-]+',1,3) as countyName,
        arb."name" as waterName
        from (
                select date_format(ctc."gmt_create",'%Y-%m-%d') "gmt_create",ctc."call_id",
                ctc."task_id",JSON_VALUE(ctc."call_task_callee_content",'$."$水库编码$"') as waterCode ,ctr."call_result" as callResult,ctr."callee_number"
                from "SJZT_ODS"."call_task_callee" ctc
                join (
                    select d.* from (
                        select * from (
                        select ctr."call_id",ctr."callee_number",ctr."call_result" from SJZT_ODS."call_task_result" ctr
                        left join SJZT_ODS."call_task" ct on ct."id" = ctr."task_id"
                        left join YWXT.sm_daily_call_task sdct on sdct.task_id = ct."id"
                        where date_format(ctr."gmt_create",'%Y-%m-%d') = #{callTaskStatistic.createTime}
                        and sdct.type = '1' and ctr."call_result" = '200000'
                        ) a
                        union all
                        select * from (
                        select ctr."call_id",ctr."callee_number",ctr."call_result"  from SJZT_ODS."call_task_result" ctr
                        left join SJZT_ODS."call_task" ct on ct."id" = ctr."task_id"
                        left join YWXT.sm_daily_call_task sdct on sdct.task_id = ct."id"
                        where date_format(ctr."gmt_create",'%Y-%m-%d') = #{callTaskStatistic.createTime}
                        and sdct.type = '2' and ctr."call_result" = '200000'
                        ) b
                        union all
                        select * from (
                        select ctr."call_id",ctr."callee_number",ctr."call_result"  from SJZT_ODS."call_task_result" ctr
                        left join SJZT_ODS."call_task" ct on ct."id" = ctr."task_id"
                        left join YWXT.sm_daily_call_task sdct on sdct.task_id = ct."id"
                        where date_format(ctr."gmt_create",'%Y-%m-%d') = #{callTaskStatistic.createTime}
                        and sdct.type = '3'
                        ) c
                    ) d left join "YWXT".sm_call_not_fill_record scnfr on scnfr.call_id = d."call_id"
                    where 1=1
                    <if test="callTaskStatistic.count==2">
                        and d."call_result" = '200000' or scnfr.task_id is not null
                    </if>
                    <if test="callTaskStatistic.count==3">
                        and d."call_result" = '200003' and scnfr.id is null
                    </if>
                    <if test="callTaskStatistic.count==4">
                        and d."call_result" = '200005' and scnfr.id is null
                    </if>
                    union all
                    select ctr."call_id",ctr."callee_number",ctr."call_result" from SJZT_ODS."call_task_result" ctr
                    left join "YWXT".sm_call_not_fill_record scnfr on scnfr.call_id = ctr."call_id"
                    left join SJZT_ODS."call_task" ct on ct."id" = ctr."task_id"
                    left join YWXT.sm_daily_call_task sdct on sdct.task_id = ct."id"
                    where date_format(ctr."gmt_create",'%Y-%m-%d') = #{callTaskStatistic.createTime}
                    and sdct.type = '1' and  sdct.type = '2' and sdct.type = '3'
                    <if test="callTaskStatistic.count==2">
                        and ctr."call_result" = '200000' and scnfr.id is not null
                    </if>
                    <if test="callTaskStatistic.count==3">
                        and ctr."call_result" = '200003' and scnfr.id is null
                    </if>
                    <if test="callTaskStatistic.count==4">
                        and ctr."call_result" = '200005' and scnfr.id is null
                    </if>
                )ctr on ctc."call_id" = ctr."call_id"
        )a
        left join "SJZT_MD"."att_res_base" arb on locate(arb."code",a.waterCode)>0
        left join "SJZT_MD"."att_ad_base" aab on aab."guid" = arb."interior_ad_guid"
        left join "YWXT".sm_call_not_fill_record scnfr on scnfr.call_id = a."call_id"
        left join "YWXT".blade_user bu on bu.phone = a."callee_number" and bu.is_deleted = 0
        where aab."ad_name" is not null
        <if test="list != null and list.size()>0">
            and aab."ad_code" in
            <foreach collection="list" item="adCode" separator ="," open="("  close=")">
                #{adCode}
            </foreach>
        </if>
        <if test="callTaskStatistic.realName!=null and callTaskStatistic.realName!=''">
            and bu.real_name like concat('%',#{callTaskStatistic.realName},'%')
        </if>
        <if test="callTaskStatistic.waterName!=null and callTaskStatistic.waterName!=''">
            and arb."name" like concat('%',#{callTaskStatistic.waterName},'%')
        </if>
    </select>
</mapper>
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/CallService.java
@@ -85,4 +85,12 @@
     * @return
     */
    Object getCallNotConnectResultList(IPage<CallTaskStatistic> page,CallTaskStatistic callTaskStatistic);
    /**
     * 按日期行政区呼叫结果详情列表信息
     * @param callTaskStatistic
     * @param page
     * @return
     */
    Object getCallResultList(IPage<CallTaskStatistic> page, CallTaskStatistic callTaskStatistic);
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/impl/CallServiceImpl.java
@@ -283,6 +283,56 @@
        return resultListPage;
    }
//    /**
//     * 查询智能外呼统计数据-按日期-行政区统计
//     * @param page
//     * @param callTaskStatistic
//     * @return
//     */
//    @Override
//    public Object getOutgoingStatisticList(IPage<CallTaskStatistic> page,CallTaskStatistic callTaskStatistic) {
//        if (null==callTaskStatistic.getCreateTime() || callTaskStatistic.getCreateTime().equals("")){
//            long l = System.currentTimeMillis();
//            // 设置当前时间的前一天
//            callTaskStatistic.setCreateTime(new SimpleDateFormat("yyyy-MM-dd").format(new Date(l - 60*60*24*1000)));
//        }
//        ThreadPoolExecutor executor = myThreadPoolConfig.threadPoolExecutor();
//        // 异步查询统计数据
//        CompletableFuture<List<CallTaskStatistic>> callTaskStatisticCompletableFuture = getListCompletableFuture(page, callTaskStatistic, executor);
//        // 查询 按区域统计连续三天,连续两天未接通,前一天拒接对应的数量
//        Map<String, Object> threeDay = computationTime(callTaskStatistic.getCreateTime(), 2);
//        Map<String, Object> twoDay = computationTime(callTaskStatistic.getCreateTime(), 1);
//        Map<String, Object> oneDay = computationTime(callTaskStatistic.getCreateTime(), 0);
//        // 查询
//        CompletableFuture<List<CallTaskStatistic>> threeDayNotCallConnect = getListCompletableFuture(callTaskStatistic, executor, threeDay, "200003", 2);
//        CompletableFuture<List<CallTaskStatistic>> twoDayNotCallConnect = getListCompletableFuture(callTaskStatistic, executor, twoDay, "200003", 1);
//        CompletableFuture<List<CallTaskStatistic>> oneDayNotCallConnect = getListCompletableFuture(callTaskStatistic, executor, oneDay, "200005", 0);
//        //等待所有任务执行完成
//        try {
//            CompletableFuture.allOf(callTaskStatisticCompletableFuture,threeDayNotCallConnect,twoDayNotCallConnect,oneDayNotCallConnect).get();
//            // 数据处理
//            List<CallTaskStatistic> callTaskStatistics = getCallTaskStatistics(callTaskStatisticCompletableFuture, oneDay, threeDayNotCallConnect, twoDayNotCallConnect, oneDayNotCallConnect);
//            // 取当前行政区总数据
//            List<CallTaskStatistic> totalList = getTotalCallTaskStatistics(callTaskStatistics,callTaskStatistic);
//            // 排序
//            callTaskStatistics = getCallTaskStatisticsByOrder(callTaskStatistic, callTaskStatistics);
//            // 合并数据
//            totalList.addAll(callTaskStatistics);
//            // 返回数据
//            if (null!= callTaskStatistic.getIsPage()) {
//                return totalList;
//            }else {
//                return page.setRecords(totalList);
//            }
//        } catch (InterruptedException e) {
//            e.printStackTrace();
//        } catch (ExecutionException e) {
//            e.printStackTrace();
//        }
//        // 返回
//        return null;
//    }
    /**
     * 查询智能外呼统计数据-按日期-行政区统计
     * @param page
@@ -297,21 +347,15 @@
            callTaskStatistic.setCreateTime(new SimpleDateFormat("yyyy-MM-dd").format(new Date(l - 60*60*24*1000)));
        }
        ThreadPoolExecutor executor = myThreadPoolConfig.threadPoolExecutor();
        // 异步查询统计数据
        // 异步查询当前天日常呼叫(3次)统计数据
        CompletableFuture<List<CallTaskStatistic>> callTaskStatisticCompletableFuture = getListCompletableFuture(page, callTaskStatistic, executor);
        // 查询 按区域统计连续三天,连续两天未接通,前一天拒接对应的数量
        Map<String, Object> threeDay = computationTime(callTaskStatistic.getCreateTime(), 2);
        Map<String, Object> twoDay = computationTime(callTaskStatistic.getCreateTime(), 1);
        Map<String, Object> oneDay = computationTime(callTaskStatistic.getCreateTime(), 0);
        // 查询
        CompletableFuture<List<CallTaskStatistic>> threeDayNotCallConnect = getListCompletableFuture(callTaskStatistic, executor, threeDay, "200003", 2);
        CompletableFuture<List<CallTaskStatistic>> twoDayNotCallConnect = getListCompletableFuture(callTaskStatistic, executor, twoDay, "200003", 1);
        CompletableFuture<List<CallTaskStatistic>> oneDayNotCallConnect = getListCompletableFuture(callTaskStatistic, executor, oneDay, "200005", 0);
        // 查询当前天除去日常呼叫外的统计数据
        CompletableFuture<List<CallTaskStatistic>> notCallConnect = getListCompletableFuture(callTaskStatistic,executor);
        //等待所有任务执行完成
        try {
            CompletableFuture.allOf(callTaskStatisticCompletableFuture,threeDayNotCallConnect,twoDayNotCallConnect,oneDayNotCallConnect).get();
            CompletableFuture.allOf(callTaskStatisticCompletableFuture,notCallConnect).get();
            // 数据处理
            List<CallTaskStatistic> callTaskStatistics = getCallTaskStatistics(callTaskStatisticCompletableFuture, oneDay, threeDayNotCallConnect, twoDayNotCallConnect, oneDayNotCallConnect);
            List<CallTaskStatistic> callTaskStatistics = getCallTaskStatistics(callTaskStatisticCompletableFuture,null,null,null, notCallConnect,callTaskStatistic);
            // 取当前行政区总数据
            List<CallTaskStatistic> totalList = getTotalCallTaskStatistics(callTaskStatistics,callTaskStatistic);
            // 排序
@@ -414,6 +458,20 @@
    }
    /**
     * 查询当前天除去日常呼叫外的统计数据
     * @param callTaskStatistic
     * @param executor
     * @return
     */
    @NotNull
    private CompletableFuture<List<CallTaskStatistic>> getListCompletableFuture(CallTaskStatistic callTaskStatistic, ThreadPoolExecutor executor) {
        return CompletableFuture.supplyAsync(()->{
                List<CallTaskStatistic> outgoingStatisticList = callTaskMapper.getNoDayOutgoingStatisticList(callTaskStatistic);
                return outgoingStatisticList;
                },executor);
    }
    /**
     * 按行政区查询对应的接通率
     * @param page
     * @param callTaskStatistic
@@ -448,28 +506,46 @@
     * @throws ExecutionException
     */
    @NotNull
    private List<CallTaskStatistic> getCallTaskStatistics(CompletableFuture<List<CallTaskStatistic>> callTaskStatisticCompletableFuture, Map<String, Object> oneDay, CompletableFuture<List<CallTaskStatistic>> threeDayNotCallConnect, CompletableFuture<List<CallTaskStatistic>> twoDayNotCallConnect, CompletableFuture<List<CallTaskStatistic>> oneDayNotCallConnect) throws InterruptedException, ExecutionException {
    private List<CallTaskStatistic> getCallTaskStatistics(CompletableFuture<List<CallTaskStatistic>> callTaskStatisticCompletableFuture,
                                                          Map<String, Object> oneDay,
                                                          CompletableFuture<List<CallTaskStatistic>> threeDayNotCallConnect,
                                                          CompletableFuture<List<CallTaskStatistic>> twoDayNotCallConnect,
                                                          CompletableFuture<List<CallTaskStatistic>> oneDayNotCallConnect,
                                                          CallTaskStatistic callTaskStatistic) throws InterruptedException, ExecutionException {
        // 获取信息
        List<CallTaskStatistic> callTaskStatistics = callTaskStatisticCompletableFuture.get();
        List<CallTaskStatistic> threeNotConnectTaskStatisticsList = threeDayNotCallConnect.get();
        List<CallTaskStatistic> twoNotConnectTaskStatisticsList = twoDayNotCallConnect.get();
//        List<CallTaskStatistic> threeNotConnectTaskStatisticsList = threeDayNotCallConnect.get();
//        List<CallTaskStatistic> twoNotConnectTaskStatisticsList = twoDayNotCallConnect.get();
        List<CallTaskStatistic> oneNotConnectTaskStatisticsList = oneDayNotCallConnect.get();
        // 遍历
        for (CallTaskStatistic taskStatistic : callTaskStatistics) {
            taskStatistic.setCreateTime(oneDay.get("endTime").toString());
            for (CallTaskStatistic statistic : threeNotConnectTaskStatisticsList) {
                if (taskStatistic.getGuid().equals(statistic.getGuid())){
                    taskStatistic.setThreeNoConnectCount(statistic.getCount());
                }
            }
            for (CallTaskStatistic statistic : twoNotConnectTaskStatisticsList) {
                if (taskStatistic.getGuid().equals(statistic.getGuid())){
                    taskStatistic.setTwoNoConnectCount(statistic.getCount());
                }
            }
//            taskStatistic.setCreateTime(oneDay.get("endTime").toString());
            taskStatistic.setCreateTime(callTaskStatistic.getCreateTime());
//            for (CallTaskStatistic statistic : threeNotConnectTaskStatisticsList) {
//                if (taskStatistic.getGuid().equals(statistic.getGuid())){
//                    taskStatistic.setThreeNoConnectCount(statistic.getCount());
//                }
//            }
//            for (CallTaskStatistic statistic : twoNotConnectTaskStatisticsList) {
//                if (taskStatistic.getGuid().equals(statistic.getGuid())){
//                    taskStatistic.setTwoNoConnectCount(statistic.getCount());
//                }
//            }
            for (CallTaskStatistic statistic : oneNotConnectTaskStatisticsList) {
                if (taskStatistic.getGuid().equals(statistic.getGuid())){
                    taskStatistic.setRefuseConnectCount(statistic.getCount());
                    Integer count = Integer.parseInt(taskStatistic.getCalleeNumberCount()) + Integer.parseInt(statistic.getCalleeNumberCount());
                    Integer connectCount = Integer.parseInt(taskStatistic.getConnectionCount()) + Integer.parseInt(statistic.getConnectionCount());
                    taskStatistic.setCalleeNumberCount(count.toString());
                    taskStatistic.setConnectionCount(connectCount.toString());
                    taskStatistic.setRefuseConnectCount(taskStatistic.getRefuseConnectCount() + statistic.getRefuseConnectCount());
                    // 计算比例
                    if (connectCount==0){
                        taskStatistic.setCallCompletingRate("0");
                    }else {
                        //格式化小数
                        DecimalFormat df = new DecimalFormat("0.00");
                        taskStatistic.setCallCompletingRate(df.format((float) connectCount / count * 100));
                    }
                }
            }
        }
@@ -873,4 +949,26 @@
        // 返回
        return page.setRecords(callNotConnectResultList);
    }
    /**
     * 按日期行政区呼叫结果详情列表信息
     * @param callTaskStatistic
     * @param page
     * @return
     */
    @Override
    public Object getCallResultList(IPage<CallTaskStatistic> page, CallTaskStatistic callTaskStatistic) {
        List<String> list = new ArrayList<>();
        if (null!= callTaskStatistic.getAdCode() && !callTaskStatistic.getAdCode().equals("")){
            // 查询所有下级区域code
            list = getAllChildrenAreaByAreaCode(callTaskStatistic.getAdCode());
        }
        if (null!=callTaskStatistic.getIsPage()){
            // 不分页
            return callTaskMapper.getCallResultList(null, list,callTaskStatistic);
        }
        List<CallTaskStatistic> callNotConnectResultList = callTaskMapper.getCallResultList(page,list, callTaskStatistic);
        // 返回
        return page.setRecords(callNotConnectResultList);
    }
}