From fd4b551f67c8824256ddc4a45002019a5fcc32f7 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 30 May 2024 06:30:59 +0800
Subject: [PATCH] md

---
 .../resources/mapper/EmisTmsTransPlanDtlMapper.xml     |  3 +--
 .../main/resources/mapper/EmisTmsTransPlanMapper.xml   | 10 +++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisTmsTransPlanDtlMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsTransPlanDtlMapper.xml
index cfa44d845..150ab459c 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsTransPlanDtlMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsTransPlanDtlMapper.xml
@@ -28,9 +28,8 @@
 
     </resultMap>
 
-
     <select id="selectSiteNameByCode" parameterType="String" resultType="string">
-        select a.site_name from emis_site a where a.site_code = #{code} limit 1
+        select group_concat(a.site_name) as site_name from emis_site a where a.del_flag='0' and FIND_IN_SET(a.site_code, #{code}) limit 1
     </select>
 
 
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsTransPlanMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsTransPlanMapper.xml
index 275a4b8bc..c427567b8 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsTransPlanMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsTransPlanMapper.xml
@@ -32,23 +32,23 @@
     </resultMap>
 
     <select id="selectFromCountryNameByLineCode" parameterType="String" resultType="string">
-        select a.name from emis_country a,emis_trans_line b where a.code=b.from_country and b.line_code = #{code}
+        select a.name from emis_country a,emis_trans_line b where a.del_flag='0' and b.del_flag='0' and a.code=b.from_country and b.line_code = #{code}  limit 1
     </select>
 
     <select id="selectCountryNameByLineCode" parameterType="String" resultType="string">
-        select a.name from emis_country a,emis_trans_line b where a.code=b.country and b.line_code = #{code}
+        select a.name from emis_country a,emis_trans_line b where  a.del_flag='0' and b.del_flag='0' and a.code=b.country and b.line_code = #{code}  limit 1
     </select>
 
     <select id="selectTotalEstCostDayByPlanId" parameterType="long" resultType="BigDecimal">
-        select sum(a.est_cost_day) as est_cost_day from emis_tms_trans_plan_dtl a where a.plan_id = #{id}
+        select sum(a.est_cost_day) as est_cost_day from emis_tms_trans_plan_dtl a where  a.del_flag='0' and a.plan_id = #{id}  limit 1
     </select>
 
     <select id="selectProdNameByCode" parameterType="String" resultType="string">
-        select group_concat(a.prod_name) from emis_trans_product a where FIND_IN_SET(a.prod_code, #{code}) limit 1
+        select group_concat(a.prod_name) from emis_trans_product a where a.del_flag='0' and FIND_IN_SET(a.prod_code, #{code}) limit 1
     </select>
 
     <select id="selectLineNameByCode" parameterType="String" resultType="string">
-        select a.line_name from emis_trans_line a where a.line_code = #{code} limit 1
+        select a.line_name from emis_trans_line a where a.del_flag='0' and a.line_code = #{code} limit 1
     </select>