From 47e78881af27e46fdfacdedd3237c4889007d16e Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 24 May 2024 10:03:15 +0800
Subject: [PATCH] md

---
 .../xdadan/erp/web/emis/EmisTmsScanRecordController.java  | 3 ++-
 .../main/resources/mapper/EmisTmsTransPlanDtlMapper.xml   | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
index 379680d3f..eef8cd0c1 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
@@ -111,11 +111,12 @@ public class EmisTmsScanRecordController extends BaseController
 
     @GetMapping("/getNextStationList")
     @JacksonFilter(include= {"startSite","destSite","startSiteName","destSiteName"},value= EmisTmsTransPlanDtl.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
-    public TableDataInfo getNextStationList()
+    public TableDataInfo getNextStationList(String siteName)
     {
         startPage();
         EmisTmsTransPlanDtl queryObj = new EmisTmsTransPlanDtl();
         queryObj.setStartSite(getLoginUser().getUser().getOwnerSiteCode());
+        queryObj.getParams().put("siteName",siteName);
         List<EmisTmsTransPlanDtl> list = emisTmsTransPlanDtlService.selectEmisTmsTransPlanDtlList(queryObj);
 
         return getDataTable(list);
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsTransPlanDtlMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsTransPlanDtlMapper.xml
index 0064b0825..6e259eb24 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsTransPlanDtlMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsTransPlanDtlMapper.xml
@@ -39,9 +39,11 @@
     <select id="selectEmisTmsTransPlanDtlList" parameterType="EmisTmsTransPlanDtl" resultMap="EmisTmsTransPlanDtlResult">
         select 1 as id, 1 as plan_id,  a.site_code as start_site , a.site_code as dest_site
         from emis_site a
-        where a.del_flag='0'
-            <if test="startSite != null  and startSite != ''"> and a.site_code!=#{startSite} and  site_type not in(1,2) </if>
-            <if test="destSite != null  and destSite != ''"> and a.site_code!=#{destSite} and  site_type not in(1,2) </if>
+        where a.del_flag='0' and  site_type not in(1,2)
+            <if test="startSite != null  and startSite != ''"> and a.site_code!=#{startSite}  </if>
+            <if test="destSite != null  and destSite != ''"> and a.site_code!=#{destSite}  </if>
+            <if test="params.siteName != null  and params.siteName != ''"> and a.site_name like concat('%',#{params.siteName},'%')  </if>
+
         order by site_code asc
     </select>