From a6b2abf3ff21164e32d9fca960c6dbcd15ccd2af Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Thu, 1 Jun 2023 15:00:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E4=BF=A1=E6=81=AF=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/trace/TraceManuOrderMapper.xml    | 12 +++++++-----
 .../mybatis/mapper/trace/TraceRecordMapper.xml       |  6 +-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/main/resources/mybatis/mapper/trace/TraceManuOrderMapper.xml b/src/main/resources/mybatis/mapper/trace/TraceManuOrderMapper.xml
index 11f297a..d9ea6c2 100644
--- a/src/main/resources/mybatis/mapper/trace/TraceManuOrderMapper.xml
+++ b/src/main/resources/mybatis/mapper/trace/TraceManuOrderMapper.xml
@@ -3,12 +3,14 @@
 <mapper namespace="com.glxp.api.dao.trace.TraceManuOrderMapper">
     <select id="filterTraces" parameterType="com.glxp.api.req.trace.TraceManuOrderRequest"
             resultType="com.glxp.api.res.trace.TraceManuOrderResponse">
-        SELECT tmo.*,mid.*,uc.companyName
+        SELECT tmo.*, mid.*, uc.companyName
         FROM trace_manu_order tmo
-                 LEFT JOIN user_company uc ON uc.id = tmo.companyIdFk
-                 LEFT JOIN (SELECT tr.recordCode,tr.createUser,tr.remark,trd.batchNo,trd.traceType
-                            FROM trace_record_log tr
-                                     LEFT JOIN trace_product_record trd ON trd.recordIdFk = tr.id) mid ON mid.recordCode = tmo.recordCode
+        LEFT JOIN user_company uc ON uc.id = tmo.companyIdFk
+        LEFT JOIN (
+        SELECT tr.recordCode, tr.createUser, tr.remark, trd.batchNo, trd.traceType
+        FROM trace_record_log tr
+        LEFT JOIN trace_product_record trd ON trd.id = tr.traceProductIdFk
+        ) mid ON mid.recordCode = tmo.recordCode
         <where>
             <if test="recordCode != '' and recordCode != null">
                 and recordCode = #{recordCode}
diff --git a/src/main/resources/mybatis/mapper/trace/TraceRecordMapper.xml b/src/main/resources/mybatis/mapper/trace/TraceRecordMapper.xml
index f1ada33..87b30cf 100644
--- a/src/main/resources/mybatis/mapper/trace/TraceRecordMapper.xml
+++ b/src/main/resources/mybatis/mapper/trace/TraceRecordMapper.xml
@@ -3,13 +3,9 @@
 <mapper namespace="com.glxp.api.dao.trace.TraceRecordMapper">
     <select id="filterTraces" parameterType="com.glxp.api.req.trace.TraceRecordRequest"
             resultType="com.glxp.api.res.trace.TraceRecordResponse">
-        SELECT tr.recordCode, tr.remark, trd.*, mid.*
+        SELECT tr.recordCode, tr.remark, trd.*
         FROM trace_record_log tr
                      LEFT JOIN trace_product_record trd ON trd.id = tr.traceProductIdFk
-                     LEFT JOIN (SELECT tor.billNo, tor.fromCorp, tor.toCorp, tor.createUser, uc.companyName
-                                FROM trace_order tor
-                                             LEFT JOIN user_company uc ON uc.id = tor.companyIdFk) mid
-                ON mid.billNo = tr.recordCode
         <where>
             <if test="recordCode != '' and recordCode != null">
                 and recordCode = #{recordCode}