解决bug的后端处理

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

@@ -10,6 +10,7 @@
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
         <result column="update_user" jdbcType="BIGINT" property="updateUser"/>
         <result column="order_no" jdbcType="VARCHAR" property="orderNo"/>
+        <result column="order_name" jdbcType="VARCHAR" property="orderName"/>
         <result column="order_id" jdbcType="BIGINT" property="orderId"/>
         <result column="task_id" jdbcType="BIGINT" property="taskId"/>
         <result column="workpiece_id" jdbcType="VARCHAR" property="workpieceId"/>
@@ -37,7 +38,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id,create_time,create_user,update_time,update_user,
-        order_no, order_id,task_id,workpiece_id,workpiece_name,procedure_id,procedure_name,measuring_type,measuring_program,ok_flag,
+        order_no, order_name, order_id,task_id,workpiece_id,workpiece_name,procedure_id,procedure_name,measuring_type,measuring_program,ok_flag,
         sketchy_xaxis_offset,sketchy_yaxis_offset,sketchy_zaxis_offset,sketchy_aaxis_offset,sketchy_baxis_offset,sketchy_caxis_offset,
         exact_xaxis_offset,exact_yaxis_offset,exact_zaxis_offset,exact_aaxis_offset,exact_baxis_offset,exact_caxis_offset,measuring_report
     </sql>
@@ -46,8 +47,9 @@
     <select id="pageList" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
-        from (select w.*
+        from (select w.*, o.order_name
         from imcs_order_quality_info w
+            left join imcs_o_order o on w.order_id = o.id
         ) s ${ew.customSqlSegment}
     </select>
 

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

@@ -106,7 +106,7 @@
 
     <select id="getFinishPlanList" resultType="java.util.Map" >
         SELECT
-            ipp.id,ippp.bom_id AS bomId,ibb.name,ibb.no,ippp.plan_bom_num as planBomNum,ioop.delivery_time as deliveryTime
+            ipp.id,ippp.bom_id AS bomId,ibb.name,ibb.parts_no as no,ippp.plan_bom_num as planBomNum,ioop.delivery_time as deliveryTime
         FROM imcs_p_plan ipp,
              imcs_p_plan_product ippp,
              imcs_o_order_product ioop,

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

@@ -44,6 +44,13 @@ public class OrderQualityPageDTO implements Serializable {
     @Excel(name = "订单编号")
     private String orderNo;
 
+    /**
+     * 订单名称
+     */
+    @ApiModelProperty(value = "订单名称")
+    @Excel(name = "订单名称")
+    private String orderName;
+
     /**
      * 订单ID
      */

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

@@ -54,6 +54,14 @@ public class OrderQuality extends Entity {
     @Excel(name = "订单ID")
     private Long orderId;
 
+    /**
+     * 订单ID
+     */
+    @ApiModelProperty(value = "订单名称")
+    @TableField(exist = false)
+    @Excel(name = "订单名称")
+    private String orderName;
+
     @ApiModelProperty(value = "任务ID")
     @TableField("task_id")
     @Excel(name = "任务ID")