From f97a84d9d37e8234fa4bc8c10e5877896f668651 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 14 Jun 2024 07:13:13 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisTmsCarController.java      | 17 ++++++++++++++++-
 .../main/resources/mapper/EmisTmsCarMapper.xml  |  6 ++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsCarController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsCarController.java
index 8149ef4b3..00913af2f 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsCarController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsCarController.java
@@ -13,6 +13,9 @@ package com.xdadan.erp.web.emis;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
+import com.xdadan.erp.emis.domain.EmisGoods;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -51,7 +54,7 @@ public class EmisTmsCarController extends BaseController
     /**
      * 查询卡车信息列表
      */
-    @PreAuthorize("@ss.hasPermi('emis:emisTmsCar:list')")
+//    @PreAuthorize("@ss.hasPermi('emis:emisTmsCar:list')")
     @GetMapping("/list")
     public TableDataInfo list(EmisTmsCar emisTmsCar)
     {
@@ -60,6 +63,18 @@ public class EmisTmsCarController extends BaseController
         return getDataTable(list);
     }
 
+    @GetMapping("/list")
+    @JacksonFilter(include= {
+            "carNo"
+    },value= EmisGoods.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
+    @RequestMapping("/listSimple")
+    public TableDataInfo listSimple(EmisTmsCar emisTmsCar)
+    {
+        startPage();
+        List<EmisTmsCar> list = emisTmsCarService.selectEmisTmsCarList(emisTmsCar);
+        return getDataTable(list);
+    }
+
 
      /**
      * 检查是否重复
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsCarMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsCarMapper.xml
index e8f7a2987..253483a91 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsCarMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsCarMapper.xml
@@ -68,6 +68,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createSite != null  and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
             <if test="updateSite != null  and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
             <if test="country != null  and country != ''"> and country like concat('%', #{country}, '%')</if>
+
+
+            <if test="searchValue != null and searchValue != ''">
+                AND ( car_no like concat(#{searchValue}, '%')  )
+            </if>
+
         </where>
         order by create_time desc
     </select>