修改bug

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/operationManagementCenter/TTaskTestUnqualifiedBomMapper.xml

@@ -35,7 +35,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id,create_user,create_time,update_time,update_user,bom_num,no,
-        task_id, task_no, order_id, order_no, plan_id, plan_no, procedure_id, bom_id, bom_name, create_user_name, handle_time, handle_user, handle_user_name, test_result, add_order_id, add_order_no,handle_way, handle_status, unique_code
+        task_id, task_no, order_id, order_no,order_name, plan_id, plan_no, procedure_id, bom_id, bom_name, create_user_name, handle_time, handle_user, handle_user_name, test_result, add_order_id, add_order_no,handle_way, handle_status, unique_code,procedureNo,procedureName,addOrderName
     </sql>
 
     <!-- 分页 -->
@@ -43,7 +43,14 @@
         select
         <include refid="Base_Column_List"/>
         from (
-        select a.* from imcs_t_task_test_unqualified_bom a
+        SELECT
+        a.*, p. NO procedureNo,
+        p. NAME procedureName,
+        o.order_name addOrderName
+        FROM
+        imcs_t_task_test_unqualified_bom a
+        LEFT JOIN imcs_b_bom_procedure p ON a.procedure_id = p.id
+        LEFT JOIN imcs_o_order o ON a.add_order_id = o.id
         ) s ${ew.customSqlSegment}
     </select>
 

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/operationManagementCenter/entity/TTaskTestUnqualifiedBom.java

@@ -58,6 +58,15 @@ public class TTaskTestUnqualifiedBom extends Entity<Long> {
     @TableField(value = "no", condition = LIKE)
     @Excel(name = "编号")
     private String no;
+
+
+    @TableField(exist = false)
+    private String procedureNo;
+
+    @TableField(exist = false)
+    private String procedureName;
+
+
     /**
      * 订单ID
      */
@@ -96,6 +105,11 @@ public class TTaskTestUnqualifiedBom extends Entity<Long> {
     @Excel(name = "订单名称")
     private String orderName;
 
+
+    @TableField(exist = false)
+    private String addOrderName;
+
+
     /**
      * 计划ID
      */