Merge remote-tracking branch 'origin/master' into master

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionReadyCenter/AAutoNodeLogMapper.xml

@@ -29,11 +29,11 @@
         select
         <include refid="Base_Column_List"/>
         from (
-        select l.*, a.task_node_no as nodeNo, c.name as resourceName, i.name as instructionName, p.`name` as procedureName from imcs_a_auto_node_log l
-        left join imcs_t_task_node a ON l.auto_node_id = a.id
-        left join imcs_tenant_productionresource c on a.resource_id = c.id
-        left join imcs_t_task d on a.task_id = d.id
-        left join imcs_b_bom_procedure p on d.procedure_id = p.id
+        select l.*, a.name as nodeNo, c.name as resourceName, i.name as instructionName, p.name as procedureName from imcs_a_auto_node_log l
+        left join imcs_resource_autocode a ON l.auto_node_id = a.id
+        left join imcs_t_task d ON l.task_id = d.id
+        left join imcs_tenant_productionresource c ON d.resource_id = c.id
+        left join imcs_b_bom_procedure p ON d.procedure_id = p.id
         left join view_module_instruction i on l.method = i.code
         ) s ${ew.customSqlSegment}
     </select>

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

@@ -47,7 +47,9 @@ public class WarnLogController extends SuperSimpleController<AAutoNodeLogService
         QueryWrap<AAutoNodeLog> wrap = handlerWrapper(null, params);
         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))).orderByDesc(AAutoNodeLog::getCreateTime);
+        //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);
+                //or(condition->condition.isNull(AAutoNodeLog::getExeResult).eq(AAutoNodeLog::getExeStatus,"2").lt(AAutoNodeLog::getStartTime, DateUtil.getAddSecondsTime(new Date(), TIMEOUT_THRESHOLD_SEC)))
         baseService.pageList(page,wrapper);
     }