Merge remote-tracking branch 'origin/master'

zhs

3 天以前 babb070a354a8ecf1473ff882e0dc8735ab59912

 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);
                }
            }
@@ -238,7 +238,6 @@
        map.put("type", serviceTask.getType());
        map.put("taskName", serviceTask.getTaskName());
        map.put("submit", "0");

        return map;
    }