呼叫详情列表接口完善

zhongrj

2023-04-26 08c5f5c5462adc994cde17039fab6795d25fa749

呼叫详情列表接口完善

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

@@ -15,7 +15,6 @@
 * @date 2023-04-25
 */
@Mapper
@DS("ztznwh")
public interface CallTaskMapper{

    /**
@@ -24,6 +23,7 @@
     * @param callTask
     * @return
     */
    @DS("ztznwh")
    @InterceptorIgnore(tenantLine = "true")
    List<CallTaskStatistic> getCallListPage(@Param("page") IPage<CallTaskStatistic> page, @Param("callTask") CallTaskStatistic callTask);

@@ -33,6 +33,15 @@
     * @param page
     * @return
     */
    @DS("ztznwh")
    @InterceptorIgnore(tenantLine = "true")
    List<CallTaskResultVO> getCallTaskResultListPage(@Param("page") IPage<CallTaskResultVO> page,@Param("callTaskResult") CallTaskResultVO callTaskResult);

    /**
     * 通过水库编码获取行政区名称
     * @param adCode
     * @return
     */
    @DS("zt")
    String getAreaNameByAdCode(@Param("adCode") String adCode);
}

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

@@ -54,12 +54,21 @@
        ctr."call_end_time" as callEndTime,
        ctr."call_record_file" as callRecordFile,
        ctr."intention_customer_flag" as intentionCustomerFlag,
        ctr."is_deleted" as isDeleted
        ctr."is_deleted" as isDeleted,
        ctc."call_task_callee_content" as callTaskCalleeContent
        from "SJZT_ODS"."call_task_result" ctr
        left join "SJZT_ODS"."call_task_callee" ctc on ctr."task_id" = ctc."task_id"
        where 1=1
        <if test="callTaskResult.taskId!=null and callTaskResult.taskId!=''">
            and ctr."task_id" = #{callTaskResult.taskId}
        </if>
        order by ctr."gmt_create" desc
    </select>

    <!--通过水库编码获取行政区名称-->
    <select id="getAreaNameByAdCode" resultType="java.lang.String">
        select aab."ad_name" from SJZT_MD."att_ad_base" aab
        left join SJZT_MD."att_res_base" arb on aab."guid" = concat(arb."ad_guid",'000000')
        where arb."code" = #{adCode}
    </select>
</mapper>

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/impl/CallServiceImpl.java

@@ -27,7 +27,6 @@

@Slf4j
@Service
@DS("ztznwh")
public class CallServiceImpl implements CallService {

    @Autowired
@@ -208,6 +207,31 @@
     */
    @Override
    public IPage<CallTaskResultVO> getCallTaskResultListPage(IPage<CallTaskResultVO> page, CallTaskResultVO callTaskResult) {
        return page.setRecords(callTaskMapper.getCallTaskResultListPage(page,callTaskResult));
        List<CallTaskResultVO> resultListPage = callTaskMapper.getCallTaskResultListPage(page, callTaskResult);
        //遍历
        if (resultListPage.size()>0) {
            for (CallTaskResultVO resultVO : resultListPage) {
                // 取出 jsonData 数据
                System.out.println("resultVO = " + resultVO);
                String callTaskCalleeContent = resultVO.getCallTaskCalleeContent();
                JSONObject jsonObject = JSONObject.parseObject(callTaskCalleeContent);
                String userName = jsonObject.getString("$用户名$");
                String adName = jsonObject.getString("$水库名称$");
                resultVO.setAdName(adName);
                resultVO.setAreaName(getAreaNameByAdCode(jsonObject.getString("$水库编码$")));
                resultVO.setUserName(userName);
            }
        }
        return page.setRecords(resultListPage);
    }

    /**
     * 通过水库编码获取行政区名称
     * @param adCode
     * @return
     */
    private String getAreaNameByAdCode(String adCode) {
        // 通过adCode查询区域名称
        return callTaskMapper.getAreaNameByAdCode(adCode);
    }
}

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

@@ -13,23 +13,24 @@
public class CallTaskResultVO extends CallTaskResult {

    /**
     * 任务名称
     * 任务内容信息
     */
    private String taskName;
    private String callTaskCalleeContent;

    /**
     * 任务状态 0：未执行  1：执行中  2：已取消 3：已终止  4：已完成
     * 水库名称
     */
    private Integer status;
    private String adName;

    /**
     * 开始时间
     * 用户名（巡查责任人名称）
     */
    private String startTime;
    private String userName;

    /**
     * 结束时间
     * 行政区名称
     */
    private String endTime;
    private String areaName;


}