吉安感知网项目-后端
linwei
2026-07-08 442f8cf748c2191213ed93ccdd2633ac4f02e038
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml
@@ -34,6 +34,8 @@
        <result column="update_user" property="updateUser"/>
        <result column="update_time" property="updateTime"/>
        <result column="status" property="status"/>
        <result column="use_date" property="useDate"/>
        <result column="service_life" property="serviceLife"/>
<!--        <result column="is_deleted" property="isDeleted"/>-->
    </resultMap>
@@ -75,6 +77,12 @@
            </if>
            <if test="param2.belongDept != null and param2.belongDept != ''">
                and belong_dept::text = #{param2.belongDept}::text
            </if>
            <if test="param2.useDate != null">
                and use_date = #{param2.useDate}
            </if>
            <if test="param2.serviceLife != null">
                and service_life = #{param2.serviceLife}
            </if>
            <if test="param2.deviceStatusList != null and param2.deviceStatusList != ''">
                and status::text in
@@ -670,6 +678,8 @@
        d.update_time,
        d.status,
        d.is_deleted,
        d.use_date,
        d.service_life,
        NULLIF(trim(d.latitude::text), '')::double precision AS latitude,
        NULLIF(trim(d.longitude::text), '')::double precision AS longitude,
        min(ad.id) as area_divide_id,