From 72b971c98c46531064d74b68fc8fe8864ed0b544 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 08 Nov 2022 09:04:56 +0800
Subject: [PATCH] 大屏溯源统计次数sql修改
---
src/main/java/org/springblade/modules/farm/mapper/FarmMapper.xml | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 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 666711f..617dba5 100644
--- a/src/main/java/org/springblade/modules/farm/mapper/FarmMapper.xml
+++ b/src/main/java/org/springblade/modules/farm/mapper/FarmMapper.xml
@@ -11,6 +11,7 @@
slogan,
introduce,
picture,
+ panoramic,longitude,latitude,
ST_ASTEXT(position) as position
from
sys_farm
@@ -32,6 +33,7 @@
slogan,
introduce,
picture,
+ panoramic,longitude,latitude,
ST_ASTEXT(position) as position
from
sys_farm
@@ -41,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>
@@ -52,16 +60,23 @@
slogan = #{farm.slogan},
introduce = #{farm.introduce},
picture = #{farm.picture},
- <if test="farm.position!=null and farm.position!=''">
- position = ST_GeomFromText(${farm.position}),
- </if>
+ province = #{farm.province},
+ 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>-->
update_time = #{farm.updateTime}
where id = #{farm.id}
</update>
<!--自定义新增农场围栏数据-->
<insert id="saveFarmInfo">
- insert into sys_farm (farm_name,farm_address,farm_area,slogan,introduce,picture,position,create_time,update_time,dept_id)
+ 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>
@@ -72,7 +87,7 @@
null,
</otherwise>
</choose>
- #{farm.createTime},#{farm.updateTime},#{farm.deptId})
+ #{farm.createTime},#{farm.updateTime},#{farm.deptId},#{farm.province},#{farm.city},#{farm.district},#{farm.panoramic},#{farm.longitude},#{farm.latitude})
</insert>
<!--详情信息（自定义查询)-->
@@ -84,6 +99,10 @@
slogan,
introduce,
picture,
+ province,
+ city,
+ district,
+ panoramic,longitude,latitude,
ST_ASTEXT(position) as position,dept_id
from
sys_farm
@@ -93,9 +112,10 @@
<!--农场数量-->
<select id="selectCountFarm" resultType="java.lang.Integer">
- SELECT COUNT(*) as count
- FROM `blade_dept`
- WHERE tenant_id='000000' AND is_deleted=0 AND parent_id!=0
+ SELECT
+ COUNT( * ) AS count
+ FROM
+ sys_farm
</select>
<!--人员数量-->
--
Gitblit v1.9.3