From d95f6551e8214d69cd0fd511ec693641eb61ba16 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 01 Aug 2022 10:36:26 +0800
Subject: [PATCH] 1、大屏首页接口修复，解决double类型相加精度问题
---
src/main/java/org/springblade/modules/farm/mapper/FarmMapper.xml | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 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..3eb5c87 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,
ST_ASTEXT(position) as position
from
sys_farm
@@ -52,6 +53,10 @@
slogan = #{farm.slogan},
introduce = #{farm.introduce},
picture = #{farm.picture},
+ province = #{farm.province},
+ city = #{farm.city},
+ district = #{farm.district},
+ panoramic = #{farm.panoramic},
<if test="farm.position!=null and farm.position!=''">
position = ST_GeomFromText(${farm.position}),
</if>
@@ -61,7 +66,7 @@
<!--自定义新增农场围栏数据-->
<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)
values
(#{farm.farmName},#{farm.farmAddress},#{farm.farmArea},#{farm.slogan},#{farm.introduce},#{farm.picture},
<choose>
@@ -72,7 +77,7 @@
null,
</otherwise>
</choose>
- #{farm.createTime},#{farm.updateTime},#{farm.deptId})
+ #{farm.createTime},#{farm.updateTime},#{farm.deptId},#{farm.province},#{farm.city},#{farm.district},#{farm.panoramic})
</insert>
<!--详情信息（自定义查询)-->
@@ -84,6 +89,10 @@
slogan,
introduce,
picture,
+ province,
+ city,
+ district,
+ panoramic,
ST_ASTEXT(position) as position,dept_id
from
sys_farm
@@ -93,9 +102,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