【丽水】增加queryTaskByCondition空指针异常判断

陈昶聿

昨天 11d763612e5dbcc5d2365683b8c8eb6c5b525653

 smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java

@@ -246,6 +246,9 @@
//        }
        //通过任务ID获取模板ID
        ServiceTask serviceTask = selectServiceTaskByTaskid(taskid);
        if (serviceTask == null) {
            throw new BaseException("任务不存在或已被删除，taskid: " + taskid);
        }
        List info = new ArrayList();
        if (serviceTask.getType().equals("1")) {
            //随访
@@ -263,9 +266,10 @@
                ServiceSubtask ss = new ServiceSubtask();
                ss.setTaskid(taskid);
                ss.setPatid(patid);
                Integer integer = serviceSubtaskMapper.selectSendstateByCondition(ss);
                if (integer != null && integer != 6) {
                    ss.setSendstate(1L);
                ss.setSendstate(3L);
                List<Integer> integer = serviceSubtaskMapper.selectSendstateByCondition(ss);
                if (integer != null) {
                    ss.setSendstate(6L);
                    serviceSubtaskMapper.updateServiceSubtaskByCondition(ss);
                }
            }
@@ -299,6 +303,9 @@
    public Map<String, Object> getScriptByCondition(Long taskid, String zyserialnum, String mzserialnum, String tsserialnum) {
        //通过任务ID获取模板ID
        ServiceTask serviceTask = selectServiceTaskByTaskid(taskid);
        if (serviceTask == null) {
            throw new BaseException("任务不存在或已被删除，taskid: " + taskid);
        }
        //通过模板ID获取问题信息
        SvyTaskTemplateScript svyTaskTemplateScript = new SvyTaskTemplateScript();
        svyTaskTemplateScript.setTemplateID(Long.valueOf(serviceTask.getTemplateid()));
@@ -507,10 +514,11 @@
        }
        List<Map<String, String>> mapList = new ArrayList<>();

        for (Map<String, String> map : ivrTaskMap.values()) {
            mapList.add(map);
        if (ivrTaskMap != null) {
            for (Map<String, String> map : ivrTaskMap.values()) {
                mapList.add(map);
            }
        }

        //将模板问题话术里的通配符替换
        for (SvyTaskTemplateScriptVO svyTaskTemplateScriptVO : svyTaskTemplateScriptVOS) {
            if (StringUtils.isNotEmpty(svyTaskTemplateScriptVO.getScriptContent())) {
@@ -603,8 +611,9 @@
            ServiceSubtask serviceSubtask = new ServiceSubtask();
            serviceSubtask.setTaskid(taskid);
            serviceSubtask.setPatid(patid);
            Integer integer = serviceSubtaskMapper.selectSendstateByCondition(serviceSubtask);
            if (integer == 3) {
            serviceSubtask.setSendstate(3L);
            List<Integer> integer = serviceSubtaskMapper.selectSendstateByCondition(serviceSubtask);
            if (integer != null) {
                serviceSubtask.setResult("完成");
                serviceSubtask.setFinishtime(new Date());
                serviceSubtask.setSendstate(6L);