From 2884bf1f32b51129a83125ecfc2cf8526f71154f Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 24 八月 2023 15:34:43 +0800
Subject: [PATCH] 更新MODBUS-TCP协议 4

---
 igds-core/src/main/resources/mapper/DicDataMapper.xml |   36 ++++++++++++++++--------------------
 1 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/igds-core/src/main/resources/mapper/DicDataMapper.xml b/igds-core/src/main/resources/mapper/DicDataMapper.xml
index ab80ed6..1d9428e 100644
--- a/igds-core/src/main/resources/mapper/DicDataMapper.xml
+++ b/igds-core/src/main/resources/mapper/DicDataMapper.xml
@@ -69,7 +69,7 @@
 
 	<!-- 鏌ヨ鏍囪 -->
 	<select id="getDicSlogan" resultType="com.ld.igds.models.DicSlogan"
-		parameterType="java.util.Map">
+			parameterType="java.util.Map">
 		select
 		*
 		from D_DIC_SLOGAN g
@@ -82,25 +82,21 @@
 
 			limit 1
 		</where>
+	</select>
 
+	<!-- 鑾峰彇鍖哄煙鍒楄〃 -->
+	<select id="listDicArea" resultType="com.ld.igds.models.DicArea"
+			parameterType="com.ld.igds.data.BaseParam">
+		select
+		CODE_ as code,
+		NAME_ as name,
+		TYPE_ as type,
+		SIMPLE_ as simple
+		from D_DIC_AREA
+		<where>
+			<if test="param.key != null">AND (NAME_ like "%"#{param.key}"%" OR SIMPLE_ like "%"#{param.key}"%" )</if>
+		</where>
+		order by CODE_
 	</select>
-	
-	<select id="pageFoodLocataion" resultType="com.ld.igds.models.DicFoodOrigin" parameterType="com.ld.igds.data.BaseParam">
-	select 
-	ID_ as id,
-	CODE_ as code,
-	NAME_ as name,
-	SIMPLE_ as simple,
-	SORT_ as SORT_,
-	DISABLED_TAG_ as disabledTag 
-	from 
-	D_DIC_FOOD_ORIGIN 
-	
-	<where>
-	     DISABLED_TAG_ ='N'
-	     <if test="param.key != null and ''!= param.key">AND (CODE_ like #{param.key} OR NAME_ like #{param.key} OR SIMPLE_ like #{param.key} )</if>
-	</where>
-	
-	order by SORT_
-	</select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3