From c358e6c680fae6d2cb1b2afa1569557d7a5071f3 Mon Sep 17 00:00:00 2001
From: liuzhaotian <liu2655477224@163.com>
Date: Thu, 9 May 2024 14:25:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=BA=8F=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81-=E6=8E=92=E5=8D=95-=E6=96=B0=E5=A2=9E=E6=8E=92?=
 =?UTF-8?q?=E5=8D=95-SQL=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/plate/PlateMapper.xml    | 47 +++++++++++++------
 1 file changed, 33 insertions(+), 14 deletions(-)

diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
index 473695fea..a3080d307 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
@@ -2,24 +2,43 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.cf.imes.module.executor.dal.mysql.plate.PlateMapper">
     <select id="selectPlatePage" resultType="com.cf.imes.module.executor.controller.admin.plan.vo.PlatePage">
+<!--        select a.id as plateId, a.name, a.width, a.height, a.thickness, a.area,-->
+<!--        b.custom_order_no, b.customer, b.address, b.remark, b.id as orderId,-->
+<!--        c.goods_name, c.material, c.color, c.goods_id-->
+<!--        from order_plate a-->
+<!--        LEFT JOIN order_plan_item p on a.id = p.item_id-->
+<!--        LEFT JOIN order_item oi on p.item_id = oi.id-->
+<!--        LEFT JOIN `order` b on oi.order_id = b.id-->
+<!--        LEFT JOIN order_goods c on a.order_id = c.order_id-->
+<!--        <where>-->
+<!--            p.id is null-->
+<!--            and a.is_cancel = 0-->
+<!--            <if test="orderId !=null">-->
+<!--               and a.order_id = #{orderId}-->
+<!--            </if>-->
+<!--            <if test="goodsId !=null and goodsId != '' ">-->
+<!--               and c.goods_id = #{goodsId}-->
+<!--            </if>-->
+<!--        </where>-->
+
         select a.id as plateId, a.name, a.width, a.height, a.thickness, a.area,
         b.custom_order_no, b.customer, b.address, b.remark, b.id as orderId,
         c.goods_name, c.material, c.color, c.goods_id
         from order_plate a
-        LEFT JOIN order_plan_item p on a.id = p.item_id
-        LEFT JOIN order_item oi on p.item_id = oi.id
-        LEFT JOIN `order` b on oi.order_id = b.id
-        LEFT JOIN order_goods c on a.order_id = c.order_id
-        <where>
-            p.id is null
-            and a.is_cancel = 0
-            <if test="orderId !=null">
-               and a.order_id = #{orderId}
-            </if>
-            <if test="goodsId !=null and goodsId != '' ">
-               and c.goods_id = #{goodsId}
-            </if>
-        </where>
+--         LEFT JOIN order_item oi on a.order_id = oi.order_id
+        LEFT JOIN `order` b on a.order_id = b.id
+        LEFT JOIN order_goods c on a.goods_id = c.goods_id
+                <where>
+                    a.is_cancel = 0
+                    <if test="orderId !=null">
+                       and a.order_id = #{orderId}
+                    </if>
+                    <if test="goodsId !=null and goodsId != '' ">
+                       and c.goods_id = #{goodsId}
+                    </if>
+                </where>
+
+
     </select>
     <select id="selectPlateByPlanId"
             resultType="com.cf.imes.module.executor.controller.admin.plan.vo.PlateResList">