处理选项不显示的问题

liusheng

3 天以前 6f1e752bf00b584c8a17569578fa8e54cdb71b60

处理选项不显示的问题

 ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java

@@ -571,6 +571,8 @@

            } else if (descByCode.equals("人工")) {
                setFailPreachForm(serviceSubtask, sendPreachform, "人工待执行", "2");
            }else if (descByCode.equals("微信小程序")) {
                setFailPreachForm(serviceSubtask, sendPreachform, "微信小程序待执行", "2");
            }
        }


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

@@ -69,7 +69,7 @@


    @Autowired
    private IvrLibaTemplateTargetoptionMapper ivrLibaTemplateTargetOptionMapper;
    private SvyLibTemplateTargetoptionMapper svyLibTemplateTargetoptionMapper;
    @Autowired
    private IvrTaskTemplateTargetoptionMapper ivrTaskTemplateTargetOptionMapper;

@@ -480,8 +480,11 @@
        svyTaskTemplateScript.setDelFlag("0");
        List<SvyTaskTemplateScript> svyTaskTemplateScripts = svyTaskTemplateScriptMapper.selectSvyTaskTemplateScriptList(svyTaskTemplateScript);
        if (CollectionUtils.isEmpty(svyTaskTemplateScripts) || svyTaskTemplateScripts.size() == 0) {
            log.info("svyTaskTemplateScripts为空了，请尽快联系管理员处理");
            return new ArrayList<>();
            insertSvyTaskTempScript(null, serviceTask);
            svyTaskTemplateScripts = svyTaskTemplateScriptMapper.selectSvyTaskTemplateScriptList(svyTaskTemplateScript);
            if (CollectionUtils.isEmpty(svyTaskTemplateScripts)) {
                throw new BaseException("请联系管理员，检查问题模板信息!");
            }
        }
        List<SvyTaskTemplateScriptVO> svyTaskTemplateScriptVOS = DtoConversionUtils.sourceToTarget(svyTaskTemplateScripts, SvyTaskTemplateScriptVO.class);

@@ -513,7 +516,6 @@
            if (StringUtils.isNotEmpty(svyTaskTemplateScriptVO.getScriptContent())) {
                for (Map<String, String> map : mapList) {
                    for (String key : map.keySet()) {

                        svyTaskTemplateScriptVO.setScriptContent(svyTaskTemplateScriptVO.getScriptContent().replace(key, StringUtils.isNotEmpty(map.get(key)) ? map.get(key) : ""));
                    }
                }
@@ -532,13 +534,70 @@
                if (svyTaskTemplateTargetoption.getNodynamiccruxs().size() == 0)
                    svyTaskTemplateTargetoption.setNodynamiccruxs(null);
                List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = svyTaskTemplateTargetoptionMapper.selectSvyTaskTemplateTargetoptionList(svyTaskTemplateTargetoption);
                svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptions);
                if (CollectionUtils.isNotEmpty(svyTaskTemplateTargetoptions)) {
                    svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptions);
                } else {
                    //如果选项没有查到，需要去基础模板库将选项查询出来，放到任务模板选项库中
                    insertSvyTaskTempScript(svyTaskTemplateScriptVO, serviceTask);

                }
            }
        }
        Collections.sort(svyTaskTemplateScriptVOS, Comparator.comparingLong(SvyTaskTemplateScriptVO::getSort));
        return svyTaskTemplateScriptVOS;
    }


    private void insertSvyTaskTempScript(SvyTaskTemplateScriptVO svyTaskTemplateScriptVO, ServiceTask serviceTask) {
        log.info("-------基础模板libtemplateid的值为：{}", serviceTask.getLibtemplateid());
        if (StringUtils.isEmpty(serviceTask.getLibtemplateid())) {
            return;
        }

        SvyLibTemplateScript svyLibTemplateScript = new SvyLibTemplateScript();
        svyLibTemplateScript.setSvyid(Long.valueOf(serviceTask.getLibtemplateid()));
        List<SvyLibTemplateScript> svyLibTemplateScripts = svyLibTemplateScriptMapper.selectSvyLibTemplateScriptList(svyLibTemplateScript);
        log.info("-------基础模板svyLibTemplateScripts问题值为：{}", svyLibTemplateScripts.size());
        for (SvyLibTemplateScript sll : svyLibTemplateScripts) {
            if (ObjectUtils.isNotEmpty(svyTaskTemplateScriptVO)) {
                if (sll.getScriptContent().trim().equals(svyTaskTemplateScriptVO.getScriptContent().trim())) {
                    SvyLibTemplateTargetoption sltto = new SvyLibTemplateTargetoption();
                    sltto.setScriptid(sll.getId());
                    List<SvyLibTemplateTargetoption> svyLibTemplateTargetoptions = svyLibTemplateTargetoptionMapper.selectSvyLibTemplateTargetoptionList(sltto);

                    //将查出来的选项，放到svyTaskTemplateTargetoption中
                    List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptionList = DtoConversionUtils.sourceToTarget(svyLibTemplateTargetoptions, SvyTaskTemplateTargetoption.class);
                    for (int i = 0; i < svyTaskTemplateTargetoptionList.size(); i++) {
                        svyTaskTemplateTargetoptionList.get(i).setTemplateID(svyTaskTemplateScriptVO.getTemplateID());
                        svyTaskTemplateTargetoptionList.get(i).setScriptid(svyTaskTemplateScriptVO.getId());
                        svyTaskTemplateTargetoptionMapper.insertSvyTaskTemplateTargetoption(svyTaskTemplateTargetoptionList.get(i));
                        log.info("-------新增完之后的选项ID值为：{}", svyTaskTemplateTargetoptionList.get(i).getId());
                    }
                    svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptionList);
                }
            } else {
                //新增问题
                SvyTaskTemplateScript stts = DtoConversionUtils.sourceToTarget(sll, SvyTaskTemplateScript.class);
                stts.setId(null);
                stts.setTaskid(serviceTask.getTaskid());
                stts.setTemplateID(serviceTask.getTemplateid());
                svyTaskTemplateScriptMapper.insertSvyTaskTemplateScript(stts);

                //新增问题选项
                SvyLibTemplateTargetoption sltto = new SvyLibTemplateTargetoption();
                sltto.setScriptid(sll.getId());
                List<SvyLibTemplateTargetoption> svyLibTemplateTargetoptions = svyLibTemplateTargetoptionMapper.selectSvyLibTemplateTargetoptionList(sltto);
                List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptionList = DtoConversionUtils.sourceToTarget(svyLibTemplateTargetoptions, SvyTaskTemplateTargetoption.class);
                for (int i = 0; i < svyTaskTemplateTargetoptionList.size(); i++) {
                    svyTaskTemplateTargetoptionList.get(i).setTemplateID(serviceTask.getTemplateid());
                    svyTaskTemplateTargetoptionList.get(i).setScriptid(stts.getId());
                    svyTaskTemplateTargetoptionMapper.insertSvyTaskTemplateTargetoption(svyTaskTemplateTargetoptionList.get(i));
                }

            }
        }
    }

    private List xjInfo(Long templateId, Long taskid, Long patid, Boolean isFinish) {
        if (isFinish == true) {
            ServiceSubtask serviceSubtask = new ServiceSubtask();