From f3d7d3f128421ac5ec88b849162166c906c6396d Mon Sep 17 00:00:00 2001
From: schry <2433098676@qq.com>
Date: Fri, 16 Jun 2023 15:54:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E6=9F=A5=E8=AF=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/trace/TraceManuOrderController.java  | 13 ++++++-------
 .../com/glxp/api/entity/trace/TraceOrderEntity.java |  4 ++++
 .../mybatis/mapper/trace/TraceManuCodeRelMapper.xml |  3 +++
 .../mybatis/mapper/trace/TraceManuOrderMapper.xml   | 12 +++++++++++-
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/trace/TraceManuOrderController.java b/src/main/java/com/glxp/api/controller/trace/TraceManuOrderController.java
index 381f5cb..1c6401a 100644
--- a/src/main/java/com/glxp/api/controller/trace/TraceManuOrderController.java
+++ b/src/main/java/com/glxp/api/controller/trace/TraceManuOrderController.java
@@ -70,7 +70,6 @@ public class TraceManuOrderController {
     @AuthRuleAnnotation("udi/trace/manu/order/filter")
     @GetMapping("udi/trace/manu/order/filter")
     public BaseResponse filterLogs(TraceManuOrderRequest traceManuOrderRequest) {
-
         List<TraceManuOrderResponse> traceManuOrderResponses = traceManuOrderService.filterTraces(traceManuOrderRequest);
         PageInfo<TraceManuOrderResponse> pageInfo = new PageInfo<>(traceManuOrderResponses);
         PageSimpleResponse<TraceManuOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
@@ -83,13 +82,13 @@ public class TraceManuOrderController {
     @AuthRuleAnnotation("udi/trace/manu/order/relCode")
     @GetMapping("udi/trace/manu/order/relCode")
     public BaseResponse filterDetail(TraceManuDetailRequest traceManuDetailRequest) {
+            List<TraceManuCodeRellResponse> traceManuCodeRellResponses = traceManuCodeRelService.filterList(traceManuDetailRequest);
+            PageInfo<TraceManuCodeRellResponse> pageInfo = new PageInfo<>(traceManuCodeRellResponses);
+            PageSimpleResponse<TraceManuCodeRellResponse> pageSimpleResponse = new PageSimpleResponse<>();
+            pageSimpleResponse.setTotal(pageInfo.getTotal());
+            pageSimpleResponse.setList(traceManuCodeRellResponses);
+            return ResultVOUtils.success(pageSimpleResponse);
 
-        List<TraceManuCodeRellResponse> traceManuCodeRellResponses = traceManuCodeRelService.filterList(traceManuDetailRequest);
-        PageInfo<TraceManuCodeRellResponse> pageInfo = new PageInfo<>(traceManuCodeRellResponses);
-        PageSimpleResponse<TraceManuCodeRellResponse> pageSimpleResponse = new PageSimpleResponse<>();
-        pageSimpleResponse.setTotal(pageInfo.getTotal());
-        pageSimpleResponse.setList(traceManuCodeRellResponses);
-        return ResultVOUtils.success(pageSimpleResponse);
     }
 
     @Resource
diff --git a/src/main/java/com/glxp/api/entity/trace/TraceOrderEntity.java b/src/main/java/com/glxp/api/entity/trace/TraceOrderEntity.java
index df9dd5a..fd8b9b5 100644
--- a/src/main/java/com/glxp/api/entity/trace/TraceOrderEntity.java
+++ b/src/main/java/com/glxp/api/entity/trace/TraceOrderEntity.java
@@ -193,5 +193,9 @@ public class TraceOrderEntity implements Serializable {
     @TableField(value = "sourceType")
     private Long sourceType;
 
+    @ApiModelProperty(value = "记录号外键")
+    @TableField(value = "recordCode")
+    private String recordCode;
+
     private static final long serialVersionUID = 1L;
 }
diff --git a/src/main/resources/mybatis/mapper/trace/TraceManuCodeRelMapper.xml b/src/main/resources/mybatis/mapper/trace/TraceManuCodeRelMapper.xml
index f28918e..9581fc0 100644
--- a/src/main/resources/mybatis/mapper/trace/TraceManuCodeRelMapper.xml
+++ b/src/main/resources/mybatis/mapper/trace/TraceManuCodeRelMapper.xml
@@ -10,6 +10,9 @@
             <if test="manuOrderNo != '' and manuOrderNo != null">
                 and manuOrderNo = #{manuOrderNo}
             </if>
+            <if test="manuOrderIdFk != '' and manuOrderIdFk != null">
+                and manuOrderIdFk = #{manuOrderIdFk}
+            </if>
         </where>
     </select>
 </mapper>
diff --git a/src/main/resources/mybatis/mapper/trace/TraceManuOrderMapper.xml b/src/main/resources/mybatis/mapper/trace/TraceManuOrderMapper.xml
index d7c2a09..bb17790 100644
--- a/src/main/resources/mybatis/mapper/trace/TraceManuOrderMapper.xml
+++ b/src/main/resources/mybatis/mapper/trace/TraceManuOrderMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.trace.TraceManuOrderMapper">
-    <select id="filterTraces" parameterType="com.glxp.api.req.trace.TraceManuOrderRequest"
+    <select id="filterTraces2" parameterType="com.glxp.api.req.trace.TraceManuOrderRequest"
             resultType="com.glxp.api.res.trace.TraceManuOrderResponse">
 --         SELECT tmo.*, mid.*, uc.companyName
 --         FROM trace_manu_order tmo
@@ -41,6 +41,16 @@
         </where>
         AND trd.batchNo IS NOT NULL
     </select>
+    <select id="filterTraces" parameterType="com.glxp.api.req.trace.TraceManuOrderRequest"
+            resultType="com.glxp.api.res.trace.TraceManuOrderResponse">
+        SELECT *
+        FROM trace_manu_order
+        <where>
+            <if test="recordCode != '' and recordCode != null">
+                and recordCode = #{recordCode}
+            </if>
+        </where>
+    </select>
     <select id="filterTraces1" parameterType="com.glxp.api.req.trace.TraceManuOrderRequest"
             resultType="com.glxp.api.res.trace.TraceManuOrderResponse">
         select *