代码提交

liusheng

2024-09-04 9526971c403417c1c007804f24884c443b9e6cd7

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

@@ -40,6 +40,9 @@
    private SvyLibTemplateScriptMapper svyLibTemplateScriptMapper;

    @Autowired
    private SvyTaskTemplateMapper svyTaskTemplateMapper;

    @Autowired
    private PatArchiveMapper patArchiveMapper;

    @Autowired
@@ -136,7 +139,7 @@
    }

    @Override
    public List getScriptInfoByCondition(Long taskid, Long patid) {
    public Map<String, Object> getScriptInfoByCondition(Long taskid, Long patid) {
        //通过任务ID获取模板ID
        ServiceTask serviceTask = selectServiceTaskByTaskid(taskid);
        List info = new ArrayList();
@@ -148,7 +151,7 @@
            info = wjInfo(serviceTask, patid);
        } else {
            //宣教
            info = xjInfo(serviceTask.getTemplateid());
            info = xjInfo(Long.valueOf(serviceTask.getLibtemplateid()));
        }

        //只要打开了页面，就算成功
@@ -158,8 +161,14 @@
        ServiceTaskSingle.setResult("success");
        ServiceTaskSingle.setFinishtime(new Date());
        serviceSubtaskMapper.updateServiceSubtaskByCondition(ServiceTaskSingle);
        SvyTaskTemplate svyTaskTemplate = svyTaskTemplateMapper.selectSvyTaskTemplateBySvyid(serviceTask.getTemplateid());
        Map<String, Object> map = new HashMap<>();
        map.put("script", info);
        map.put("revisitAfter", svyTaskTemplate.getConclusion());
        map.put("type", serviceTask.getType());
        map.put("taskName",serviceTask.getTaskName());

        return info;
        return map;
    }

    /**
@@ -232,7 +241,7 @@
    private List wjInfo(ServiceTask serviceTask, Long patid) {
        //通过模板ID获取问题信息
        SvyLibTemplateScript svyLibTemplateScript = new SvyLibTemplateScript();
        svyLibTemplateScript.setId(Long.valueOf(serviceTask.getTemplateid()));
        svyLibTemplateScript.setSvyid(Long.valueOf(serviceTask.getLibtemplateid()));
        svyLibTemplateScript.setDelFlag("0");
        List<SvyLibTemplateScript> svyLibTemplateScripts = svyLibTemplateScriptMapper.selectSvyLibTemplateScriptList(svyLibTemplateScript);
        if (CollectionUtils.isEmpty(svyLibTemplateScripts) || svyLibTemplateScripts.size() == 0) {