大屏溯源统计次数sql修改

guoshilong

2022-11-08 72b971c98c46531064d74b68fc8fe8864ed0b544

 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,16 +64,19 @@
        city = #{farm.city},
        district = #{farm.district},
        panoramic = #{farm.panoramic},
        <if test="farm.position!=null and farm.position!=''">
            position = ST_GeomFromText(${farm.position}),
        </if>
        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,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