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

---
 .../api/controller/trace/TraceOrderController.java     | 10 ----------
 .../mybatis/mapper/trace/TraceRecordMapper.xml         |  2 +-
 .../mybatis/mapper/trace/TraceTaskNoticeMapper.xml     |  2 +-
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/trace/TraceOrderController.java b/src/main/java/com/glxp/api/controller/trace/TraceOrderController.java
index 2128b52..0d63af1 100644
--- a/src/main/java/com/glxp/api/controller/trace/TraceOrderController.java
+++ b/src/main/java/com/glxp/api/controller/trace/TraceOrderController.java
@@ -68,17 +68,7 @@ public class TraceOrderController extends BaseController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
-    @AuthRuleAnnotation("")
-    @GetMapping("udi/trace/order/filterBatchNo")
-    public BaseResponse filterCompanyName(TraceProductRecordRequest traceProductRecordRequest) {
 
-        List<TraceProductRecordResponse> traceProductRecordResponses = traceOrderService.filterBatchNo(traceProductRecordRequest);
-        PageInfo<TraceProductRecordResponse> pageInfo = new PageInfo<>(traceProductRecordResponses);
-        PageSimpleResponse<TraceProductRecordResponse> pageSimpleResponse = new PageSimpleResponse<>();
-        pageSimpleResponse.setTotal(pageInfo.getTotal());
-        pageSimpleResponse.setList(traceProductRecordResponses);
-        return ResultVOUtils.success(pageSimpleResponse);
-    }
 
 
 
diff --git a/src/main/resources/mybatis/mapper/trace/TraceRecordMapper.xml b/src/main/resources/mybatis/mapper/trace/TraceRecordMapper.xml
index b8d7d00..5164370 100644
--- a/src/main/resources/mybatis/mapper/trace/TraceRecordMapper.xml
+++ b/src/main/resources/mybatis/mapper/trace/TraceRecordMapper.xml
@@ -5,7 +5,7 @@
             resultType="com.glxp.api.res.trace.TraceRecordResponse">
         SELECT tr.recordCode, tr.remark, trd.*, mid.*
         FROM trace_record_log tr
-                     LEFT JOIN trace_product_record trd ON trd.recordIdFk = tr.id
+                     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
diff --git a/src/main/resources/mybatis/mapper/trace/TraceTaskNoticeMapper.xml b/src/main/resources/mybatis/mapper/trace/TraceTaskNoticeMapper.xml
index 2ca467b..b314bb0 100644
--- a/src/main/resources/mybatis/mapper/trace/TraceTaskNoticeMapper.xml
+++ b/src/main/resources/mybatis/mapper/trace/TraceTaskNoticeMapper.xml
@@ -17,7 +17,7 @@
                 and cpmctymc LIKE CONCAT('%', #{cpmctymc}, '%')
             </if>
             <if test="ggxh != '' and ggxh != null">
-                and ggxh = #{ggxh}
+                and ggxh LIKE CONCAT('%', #{ggxh}, '%')
             </if>
             <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
                 and ylqxzcrbarmc = #{ylqxzcrbarmc}