OCT

REM: 1.修改自动获取处置设备任务状态功能的判断条件
2020-11-12 16:42:51 +08:00 · 2020-11-12 16:42:51 +08:00 · 29db84de76
parent 08d68b66ab
commit 29db84de76
1 changed files with 1 additions and 1 deletions
--- a/src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java
+++ b/src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java
@ -715,7 +715,7 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService {

            // 任务预计结束5分钟内，
            if (Helper.getTimestampDiffNow(task.getPlanEndTime()) < 5 * 60) {
-                if (v.getEndTime() == null && Helper.getTimestampDiffNow(v.getEndTime()) < 5 * 60) {
+                if (v.getEndTime() == null || Helper.getTimestampDiffNow(v.getEndTime()) < 5 * 60) {
                    MulReturnType<ErrorCode, Long> ret = ai.getDb().taskStatus(v.getId());

                    if (ret.getFirstParam() == ErrorCode.ERR_OK) {