修复后台展示bug

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/mq/TaskWorkNode.java

@@ -442,7 +442,8 @@ public class TaskWorkNode {
                     if((boolean)conMap.get("result")){
                         log.setExeResult("0").setManual("0").setFeedback("接口响应超时");
                     }else{
-                        log.setExeResult("0").setManual("0").setFeedback("设备资源不通过");
+                        //设备不在线默认存储为空
+                        log.setExeResult("0").setManual("0").setFeedback(null);
                     }
                 }
             }

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/operationManagementCenter/TaskController.java

@@ -90,7 +90,7 @@ public class TaskController extends SuperController<TaskService, Long, TTask, TT
                 .eq(TTask::getDraftFlag,"0")
                .eq(TTask::getResourceId,data.getResourceId())
                 .in(TTask::getStatus,statusArr)
-                .orderByAsc(TTask::getExpectStartTime).orderByAsc(TTask::getPrority);
+                .orderByAsc(TTask::getExpectStartTime).orderByDesc(TTask::getPrority);
         IPage<TTask> ipage = baseService.pageList(page,task.getMulPlanStatus(), wrapper);
         List<TTask> list = ipage.getRecords();
         //处理执行对象，目前和生产资源是一样，后续加入人工序再做处理

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/productionReadyCenter/WarnLogController.java

@@ -48,7 +48,7 @@ public class WarnLogController extends SuperSimpleController<AAutoNodeLogService
         LbqWrapper<AAutoNodeLog> wrapper = wrap.lambda();
 
         //wrapper.eq(AAutoNodeLog::getExeResult,"0").or(condition->condition.isNull(AAutoNodeLog::getExeResult).eq(AAutoNodeLog::getExeStatus,"2").lt(AAutoNodeLog::getStartTime, DateUtil.getAddSecondsTime(new Date(), TIMEOUT_THRESHOLD_SEC))).orderByAsc(AAutoNodeLog::getStatus).orderByDesc(AAutoNodeLog::getCreateTime);
-        wrapper.eq(AAutoNodeLog::getExeResult,"0").orderByAsc(AAutoNodeLog::getStatus).orderByDesc(AAutoNodeLog::getCreateTime);
+        wrapper.eq(AAutoNodeLog::getExeResult,"0").isNotNull(AAutoNodeLog::getFeedback).orderByAsc(AAutoNodeLog::getStatus).orderByDesc(AAutoNodeLog::getCreateTime);
                 //or(condition->condition.isNull(AAutoNodeLog::getExeResult).eq(AAutoNodeLog::getExeStatus,"2").lt(AAutoNodeLog::getStartTime, DateUtil.getAddSecondsTime(new Date(), TIMEOUT_THRESHOLD_SEC)))
         baseService.pageList(page,wrapper, null);
     }