Merge remote-tracking branch 'origin/master'

zhs

2 天以前 babb070a354a8ecf1473ff882e0dc8735ab59912

Merge remote-tracking branch 'origin/master'

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

@@ -224,8 +224,8 @@
                Integer integer = serviceSubtaskMapper.selectSendstateByCondition(ss);
                if (integer != null && integer != 6) {
                    ss.setSendstate(1L);
                    ss.setResult("success");
                    ss.setFinishtime(new Date());
//                    ss.setResult("success");
//                    ss.setFinishtime(new Date());
                    serviceSubtaskMapper.updateServiceSubtaskByCondition(ss);
                }
            }

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

@@ -169,8 +169,8 @@
        SvyTaskSingle svyTaskSingle = new SvyTaskSingle();
        svyTaskSingle.setTaskid(taskid);
        svyTaskSingle.setPatid(patid);
        svyTaskSingle.setResult("success");
        svyTaskSingle.setFinishtime(new Date());
//        svyTaskSingle.setResult("success");
//        svyTaskSingle.setFinishtime(new Date());
        svyTaskSingleMapper.updateSvyTaskSingle(svyTaskSingle);

        return svyLibTemplateScriptVOS;