From 4e8eedbcaa35a3cce9e50dad54db9633e71d169f Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 05 Sep 2022 17:02:48 +0800
Subject: [PATCH] 修改文件上传路径

---
 src/main/java/org/springblade/modules/farm/mapper/FarmMapper.xml |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springblade/modules/farm/mapper/FarmMapper.xml b/src/main/java/org/springblade/modules/farm/mapper/FarmMapper.xml
index 3eb5c87..9fbb27b 100644
--- a/src/main/java/org/springblade/modules/farm/mapper/FarmMapper.xml
+++ b/src/main/java/org/springblade/modules/farm/mapper/FarmMapper.xml
@@ -11,7 +11,7 @@
                slogan,
                introduce,
                picture,
-               panoramic,
+               panoramic,longitude,latitude,
                ST_ASTEXT(position) as position
         from
             sys_farm
@@ -33,6 +33,7 @@
                slogan,
                introduce,
                picture,
+               panoramic,longitude,latitude,
                ST_ASTEXT(position) as position
         from
             sys_farm
@@ -42,6 +43,12 @@
         </if>
         <if test="farm.deptId!=null and farm.deptId!=''">
             and dept_id = #{farm.deptId}
+        </if>
+        <if test="farm.ids!=null and farm.ids!=''">
+            and id in
+            <foreach item="id" collection="farm.ids.split(',')" open="(" separator=" , " close=")">
+                #{id}
+            </foreach>
         </if>
     </select>
 
@@ -57,6 +64,8 @@
         city = #{farm.city},
         district = #{farm.district},
         panoramic = #{farm.panoramic},
+        longitude = #{farm.longitude},
+        latitude = #{farm.latitude},
         <if test="farm.position!=null and farm.position!=''">
             position = ST_GeomFromText(${farm.position}),
         </if>
@@ -66,7 +75,8 @@
 
     <!--自定义新增农场围栏数据-->
     <insert id="saveFarmInfo">
-        insert into  sys_farm (farm_name,farm_address,farm_area,slogan,introduce,picture,position,create_time,update_time,dept_id,province,city,district,panoramic)
+        insert into  sys_farm (farm_name,farm_address,farm_area,slogan,introduce,picture,position,
+                               create_time,update_time,dept_id,province,city,district,panoramic,longitude,latitude)
         values
         (#{farm.farmName},#{farm.farmAddress},#{farm.farmArea},#{farm.slogan},#{farm.introduce},#{farm.picture},
         <choose>
@@ -77,7 +87,7 @@
                 null,
             </otherwise>
         </choose>
-        #{farm.createTime},#{farm.updateTime},#{farm.deptId},#{farm.province},#{farm.city},#{farm.district},#{farm.panoramic})
+        #{farm.createTime},#{farm.updateTime},#{farm.deptId},#{farm.province},#{farm.city},#{farm.district},#{farm.panoramic},#{farm.longitude},#{farm.latitude})
     </insert>
 
     <!--详情信息(自定义查询)-->
@@ -92,7 +102,7 @@
                province,
                city,
                district,
-               panoramic,
+               panoramic,longitude,latitude,
                ST_ASTEXT(position) as position,dept_id
         from
             sys_farm

--
Gitblit v1.9.3