修改bug

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/TaskNodeServiceImpl.java

@@ -1399,7 +1399,7 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
         updateBizStatus(taskNode, task, taskNodeList, lg, callBackJson, r,currWorkpiece);
 
         //websocket推送TODO临时注释
-//        msgUtil.pushTask(task);
+        msgUtil.pushTask(task);
 
         //推送到消息队列
         msgUtil.pushToNextMq(taskNode, task, taskNodeList, n, callBackJson,currWorkpiece);

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

@@ -42,10 +42,10 @@
     </select>
 
     <select id="taskAutoNodeList" parameterType="com.github.zuihou.business.productionReadyCenter.entity.AutoNode" resultType="com.github.zuihou.business.productionReadyCenter.entity.AutoNode">
-        select a.*,c.name as resourceName,d.code,d.name as instructionName,d.remark,b.exe_result as exeResult,b.start_time as startTime,
+        select a.*,c.name as resourceName,'' code,'' as instructionName,'' remark,b.exe_result as exeResult,b.start_time as startTime,
         b.end_time as endTime,b.feedback,b.feedback_file as feedbackFile,b.exe_status as exeStatus
-        from imcs_a_auto_node a
-        left join imcs_a_auto_node_log b on a.id = b.auto_node_id
+        from imcs_t_task_node a
+        left join imcs_a_auto_node_log b on a.id = b.task_node_id
         <if test="orderId != null and orderId != ''">
             and b.order_id = #{orderId}
         </if>
@@ -56,7 +56,6 @@
             and b.task_id in (${taskIds})
         </if>
         left join imcs_tenant_productionresource c on a.resource_id = c.id
-        left join view_module_instruction d on a.instruction_id = d.id
         where 1=1
         <if test="procedureId != null and procedureId != ''">
             and a.procedure_id = #{procedureId}