From c0e32958d870fde291573499be8417ff0aa3a532 Mon Sep 17 00:00:00 2001
From: schry <2433098676@qq.com>
Date: Fri, 26 May 2023 10:54:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E6=BA=AF=E6=9F=A5=E8=AF=A2=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/res/trace/TraceRecordResponse.java    | 21 ++++++++++++
 .../mybatis/mapper/trace/TraceOrderMapper.xml |  3 +-
 .../mapper/trace/TraceRecordMapper.xml        | 34 +++----------------
 3 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/src/main/java/com/glxp/api/res/trace/TraceRecordResponse.java b/src/main/java/com/glxp/api/res/trace/TraceRecordResponse.java
index 0a92329..8afdefc 100644
--- a/src/main/java/com/glxp/api/res/trace/TraceRecordResponse.java
+++ b/src/main/java/com/glxp/api/res/trace/TraceRecordResponse.java
@@ -63,6 +63,11 @@ public class TraceRecordResponse {
      */
     private String ylqxzcrbarmc;
 
+    /**
+     * 注册备案证号
+     */
+    private String zczbhhzbapzbh;
+
     /**
      * 产品主DI标识
      */
@@ -98,4 +103,20 @@ public class TraceRecordResponse {
      */
     private String serialNo;
 
+    /**
+     * 发货单位
+     */
+    private String fromCorp;
+
+    /**
+     * 收货单位
+     */
+    private String toCorp;
+
+    /**
+     * 所属企业
+     */
+    private String companyName;
+
+
 }
diff --git a/src/main/resources/mybatis/mapper/trace/TraceOrderMapper.xml b/src/main/resources/mybatis/mapper/trace/TraceOrderMapper.xml
index c1ef3d0..093ae4d 100644
--- a/src/main/resources/mybatis/mapper/trace/TraceOrderMapper.xml
+++ b/src/main/resources/mybatis/mapper/trace/TraceOrderMapper.xml
@@ -3,7 +3,8 @@
 <mapper namespace="com.glxp.api.dao.trace.TraceOrderMapper">
     <select id="queryTraceOrderList" parameterType="com.glxp.api.req.trace.TraceOrderDetailRequest"
             resultType="com.glxp.api.res.trace.TraceOrderResponse">
-        SELECT tor.*,uc.companyName
+        SELECT tor.*
+             ,uc.companyName
         FROM trace_order tor
         LEFT JOIN user_company uc ON uc.id = tor.companyIdFk
         LEFT JOIN (SELECT tr.recordCode,trd.*
diff --git a/src/main/resources/mybatis/mapper/trace/TraceRecordMapper.xml b/src/main/resources/mybatis/mapper/trace/TraceRecordMapper.xml
index d57ca76..ef309bf 100644
--- a/src/main/resources/mybatis/mapper/trace/TraceRecordMapper.xml
+++ b/src/main/resources/mybatis/mapper/trace/TraceRecordMapper.xml
@@ -3,38 +3,15 @@
 <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 *
-        from trace_record
-                     inner join trace_record_detail
-                on trace_record.id = trace_record_detail.recordIdFk
+        SELECT tr.recordCode,tr.remark,trd.*,mid.*
+        FROM trace_record tr
+        LEFT JOIN trace_record_detail trd ON trd.recordIdFk = tr.id
+        LEFT JOIN (SELECT tor.recordCodeFk,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.recordCodeFk = tr.recordCode
         <where>
-            <if test="id != '' and id != null">
-                and id = #{id}
-            </if>
             <if test="recordCode != '' and recordCode != null">
                 and recordCode = #{recordCode}
             </if>
-            <if test="fromType != '' and fromType != null">
-                and fromType = #{fromType}
-            </if>
-            <if test="createUser != '' and createUser != null">
-                and `createUser` = #{createUser}
-            </if>
-            <if test="traceType != '' and traceType != null">
-                and traceType = #{traceType}
-            </if>
-            <if test="udiCode != '' and udiCode != null">
-                and udiCode = #{udiCode}
-            </if>
-            <if test="creditNum != '' and creditNum != null">
-                and creditNum = #{creditNum}
-            </if>
-            <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
-                and `ylqxzcrbarmc` = #{ylqxzcrbarmc}
-            </if>
-            <if test="nameCode != '' and nameCode != null">
-                and nameCode = #{nameCode}
-            </if>
             <if test="cpmctymc != '' and cpmctymc != null">
                 and cpmctymc = #{cpmctymc}
             </if>
@@ -45,6 +22,5 @@
                 and `batchNo` = #{batchNo}
             </if>
         </where>
-        ORDER BY id DESC
     </select>
 </mapper>