修改bug

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

@@ -27,7 +27,7 @@
         id,node_no,create_time,create_user,update_time,update_user,module_id,delay_flag,
         resource_id, prority, success_opt, fail_opt, procedure_id, instruction_id, procedure_productionresource_id,
         resourceName,instructionName,failCode,successCode,remark,code,self_examine,examine_match_conf,examine_rate,examine_break_conf,rated_workHours,stock_conf,resource_in_id,
-        position_in_id,position_in_ask,resource_out_id,position_out_id,position_out_ask,interface_type,node_name
+        position_in_id,position_in_ask,resource_out_id,position_out_id,position_out_ask,interface_type,node_name,complete_batch_sort
     </sql>
 
     <select id="pageList" resultMap="BaseResultMap">
@@ -46,24 +46,24 @@
         b.end_time as endTime,b.feedback,b.feedback_file as feedbackFile,b.exe_status as exeStatus
         from imcs_t_task_node a
         left join imcs_a_auto_node_log b on a.id = b.task_node_id
+        left join imcs_tenant_productionresource c on a.resource_id = c.id
+        where 1=1
         <if test="orderId != null and orderId != ''">
-            and b.order_id = #{orderId}
+            and a.order_id = #{orderId}
         </if>
         <if test="taskId != null and taskId != ''">
-            and b.task_id = #{taskId}
+            and a.task_id = #{taskId}
         </if>
         <if test="taskIds != null and taskIds != ''">
-            and b.task_id in (${taskIds})
+            and a.task_id in (${taskIds})
         </if>
-        left join imcs_tenant_productionresource c on a.resource_id = c.id
-        where 1=1
         <if test="procedureId != null and procedureId != ''">
             and a.procedure_id = #{procedureId}
         </if>
         <if test="procedureIds != null and procedureIds != ''">
             and a.procedure_id  in (${procedureIds})
         </if>
-        order by a.prority desc
+        order by a.complete_batch_sort asc
     </select>
 
     <select id="getNodeList" resultMap="BaseResultMap" parameterType="com.github.zuihou.business.productionReadyCenter.entity.AutoNode">

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/AutoNode.java

@@ -135,6 +135,12 @@ public class AutoNode extends Entity<Long> {
     private String delayFlag;
 
 
+    @ApiModelProperty(value = "推迟(1-是0-否）")
+    @TableField(exist = false)
+    @Excel(name = "推迟(1-是0-否）")
+    private String completeBatchSort;
+
+
     @ApiModelProperty(value = "父节点id")
     @TableField("parent_id")
     @Excel(name = "父节点id")