From f4581bc78820c7d0ac9b736c8b7d5ef196e426e1 Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Wed, 31 May 2023 17:29:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=B0=E5=BD=95=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/api/req/trace/TraceRecordRequest.java     | 5 ++++-
 .../java/com/glxp/api/res/trace/TraceRecordResponse.java    | 5 ++++-
 .../resources/mybatis/mapper/trace/TraceRecordMapper.xml    | 6 ++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/glxp/api/req/trace/TraceRecordRequest.java b/src/main/java/com/glxp/api/req/trace/TraceRecordRequest.java
index 08eb4a7..f5553c8 100644
--- a/src/main/java/com/glxp/api/req/trace/TraceRecordRequest.java
+++ b/src/main/java/com/glxp/api/req/trace/TraceRecordRequest.java
@@ -35,7 +35,10 @@ public class TraceRecordRequest extends ListPageRequest {
      * 更新时间
      */
     private Date updateTime;
-
+    /**
+     * 查询方式（1:源头查询；2：现在检查查询)
+     */
+    private Integer traceSource;
     /**
      * 查询方案（按UDI码查询/按批次号查询）
      */
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 8afdefc..f7757bd 100644
--- a/src/main/java/com/glxp/api/res/trace/TraceRecordResponse.java
+++ b/src/main/java/com/glxp/api/res/trace/TraceRecordResponse.java
@@ -47,7 +47,10 @@ public class TraceRecordResponse {
      * 查询方案（按UDI码查询/按批次号查询）
      */
     private Integer traceType;
-
+    /**
+     * 查询方式（1:源头查询；2：现在检查查询)
+     */
+    private Integer traceSource;
     /**
      * UDI码
      */
diff --git a/src/main/resources/mybatis/mapper/trace/TraceRecordMapper.xml b/src/main/resources/mybatis/mapper/trace/TraceRecordMapper.xml
index 5164370..f1ada33 100644
--- a/src/main/resources/mybatis/mapper/trace/TraceRecordMapper.xml
+++ b/src/main/resources/mybatis/mapper/trace/TraceRecordMapper.xml
@@ -23,6 +23,12 @@
             <if test="batchNo != '' and batchNo != null">
                 and `batchNo` = #{batchNo}
             </if>
+            <if test="traceType != '' and traceType != null">
+                and trd.traceType = #{traceType}
+            </if>
+            <if test="traceSource != '' and traceSource != null">
+                and traceSource = #{traceSource}
+            </if>
         </where>
     </select>
 </mapper>