智能外呼导出修改

zhongrj

2023-06-19 844f695f85ac743b002dd80da2e313e927121b82

智能外呼导出修改

 skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/vo/CallTaskResultVO.java

@@ -108,5 +108,9 @@
     */
    private String ids;

    /**
     * 是否短信填报反馈
     */
    private String isSmsFill;

}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.java

@@ -33,6 +33,8 @@
     * 查询呼叫详情列表信息
     * @param callTaskResult
     * @param page
     * @param list
     * @param idsList
     * @return
     */
    @DS("ztznwh")

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.xml

@@ -56,7 +56,13 @@
        ctr."is_deleted" as isDeleted,
        ctc.waterCode,
        aab."ad_name" as areaName,
        cas."tag_title" as tagTitle,
        case when ctr."call_result"!='200000' then concat(
        if(ifnull(scnfr.is_danger,0)='0','',if(scnfr.is_danger='是','发现险情,','未发现险情,')),
        if(ifnull(scnfr.is_patrol_person,0)='0','',if(scnfr.is_patrol_person='是','是巡查责任人,','不是巡查责任人,')) ,
        if(ifnull(scnfr.is_patrol,0)='0','',if(scnfr.is_patrol='是','已巡查,','未巡查,')),
        if(ifnull(scnfr.is_over,0)='0','',if(scnfr.is_over='是','超汛限','未超汛限'))
        )
        else cas."tag_title" end as tagTitle,
        ctc.userName,
        arb."name" as waterName,
        arb."res_reg_code" resRegCode,
@@ -65,10 +71,15 @@
        arb."rv_name" rvName,
        REGEXP_SUBSTR (arb."res_loc",'[^-]+',1,2) as cityName,
        REGEXP_SUBSTR (arb."res_loc",'[^-]+',1,3) as countyName,
        if(ifnull(cas."tag_title",0)>'0',if(instr(cas."tag_title",'未发现险情')>0,1,if(instr(cas."tag_title",'发现险情')>0,2,0)),0) isDange,
        if(ifnull(cas."tag_title",0)>'0',if(instr(cas."tag_title",'是否巡查责任人-未识别')>0,0,if(instr(cas."tag_title",'不是巡查责任人')>0,1,if(instr(cas."tag_title",'是巡查责任人')>0,2,0))),0) isMan,
        if(ifnull(cas."tag_title",0)>'0',if(instr(cas."tag_title",'是否巡查-未识别')>0,0,if(instr(cas."tag_title",'未巡查')>0,1,if(instr(cas."tag_title",'已巡查')>0,2,0))),0) isPatrol,
        if(ifnull(cas."tag_title",0)>'0',if(instr(cas."tag_title",'是否超汛限-未识别')>0,0,if(instr(cas."tag_title",'未超汛限')>0,1,if(instr(cas."tag_title",'超汛限')>0,2,0))),0) isOver
        if(ifnull(scnfr.call_id,0)='0','','已反馈') isSmsFill,
        case when ctr."call_result"!='200000' then if(ifnull(scnfr.is_danger,0)>'0',if(scnfr.is_danger='是',2,1),0)
            else if(ifnull(cas."tag_title",0)>'0',if(instr(cas."tag_title",'未发现险情')>0,1,if(instr(cas."tag_title",'发现险情')>0,2,0)),0) end as isDange,
        case when ctr."call_result"!='200000' then if(ifnull(scnfr.is_patrol_person,0)>'0',if(scnfr.is_patrol_person='是',2,1),0)
            else if(ifnull(cas."tag_title",0)>'0',if(instr(cas."tag_title",'是否巡查责任人-未识别')>0,0,if(instr(cas."tag_title",'不是巡查责任人')>0,1,if(instr(cas."tag_title",'是巡查责任人')>0,2,0))),0) end as isMan,
        case when ctr."call_result"!='200000' then if(ifnull(scnfr.is_patrol,0)>'0',if(scnfr.is_patrol='是',2,1),0)
            else if(ifnull(cas."tag_title",0)>'0',if(instr(cas."tag_title",'是否巡查-未识别')>0,0,if(instr(cas."tag_title",'未巡查')>0,1,if(instr(cas."tag_title",'已巡查')>0,2,0))),0) end as isPatrol,
        case when ctr."call_result"!='200000' then if(ifnull(scnfr.is_over,0)>'0',if(scnfr.is_over='是',2,1),0)
            else if(ifnull(cas."tag_title",0)>'0',if(instr(cas."tag_title",'是否超汛限-未识别')>0,0,if(instr(cas."tag_title",'未超汛限')>0,1,if(instr(cas."tag_title",'超汛限')>0,2,0))),0) end as isOver
        from "SJZT_ODS"."call_task_result" ctr
        left join
        (
@@ -89,6 +100,7 @@
        ) cas
        on cas."call_id" = ctr."call_id"
        left join "SJZT_ODS"."call_task" ct on ct."id" = ctr."task_id"
        left join "YWXT".sm_call_not_fill_record scnfr on scnfr.call_id = ctr."call_id"
        where 1=1
        <if test="callTaskResult.taskId!=null and callTaskResult.taskId!=''">
            and ctr."task_id" = #{callTaskResult.taskId}

 skjcmanager/skjcmanager-service/skjcmanager-xxljob/src/main/java/cn/gistack/job/executor/jobhandler/OutCallXxlJob.java

@@ -78,7 +78,7 @@
     * @return
     * @throws Exception
     */
    @XxlJob("createOutCallTaskByNotConnectJobHandler_test")
    @XxlJob("createOutCallTaskByNotConnectJobHandler_test_0619")
    public ReturnT<String> createOutCallTaskByNotConnectJobHandler(String param){
        XxlJobLogger.log("开始执行智能外呼未接通呼叫任务...");
        JSONObject jsonParam = JSON.parseObject(param);