Merge branch 'master' of http://git.ht-atia.cn/qinyanlei/inspect

inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java

@@ -1160,8 +1160,8 @@ public class PatrolResultController extends BaseController {
                                 logger.info("GET_INFO_41 ROBOT_TASK_STATUS patrolTaskStatusList: {}", patrolTaskStatusList);
                                 if (!patrolTaskStatusList.isEmpty()) {
                                     PatrolTaskStatus patrolTaskStatusOfDb = patrolTaskStatusList.get(0);
-                                    // 除了db非完成或终止状态，当db状态与上报状态不一致时，更新db状态
-                                    if(!Arrays.asList(TaskStatus.DONE, TaskStatus.HALTED).contains(patrolTaskStatusOfDb.getTaskState())
+                                    // 除了db非完成或终止或暂停状态，当db状态与上报状态不一致时，更新db状态
+                                    if (!Arrays.asList(TaskStatus.DONE.getCode(), TaskStatus.HALTED.getCode(), TaskStatus.PAUSED.getCode()).contains(patrolTaskStatusOfDb.getTaskState())
                                             && !patrolTaskStatusItem.getTaskState().equals(TaskStatus.DONE.getCode())
                                             && !patrolTaskStatusOfDb.getTaskState().equals(patrolTaskStatusItem.getTaskState())) {
                                         logger.info("GET_INFO_41 UPDATE TASK_STATE old: {} TO new: {}", patrolTaskStatusOfDb.getTaskState(), patrolTaskStatusItem.getTaskState());