fix(gd): 修复线索事件查询中的SQL语法错误

linwei

14 hours ago 08ddfad4530a014094c06fe68b8c2d9a0753403a

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainPlanMapper.xml

@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.sxkj.fw.device.mapper.FwDeviceMaintainPlanMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="fwDeviceMaintainPlanResultMap" type="org.sxkj.fw.device.vo.FwDeviceMaintainPlanVO">
        <result column="id" property="id"/>
@@ -20,6 +19,8 @@
        <result column="purpose" property="purpose"/>
        <result column="charger" property="charger"/>
        <result column="device_create_time" property="createTime"/>
        <result column="maintain_status" property="maintainStatus"/>
        <result column="last_maintain_time" property="lastMaintainTime"/>
    </resultMap>

    <sql id="deviceFields">
@@ -38,10 +39,10 @@

    <select id="getFwDeviceMaintainPlanById" resultMap="fwDeviceMaintainPlanResultMap">
        select
            <include refid="deviceFields"/>,a.*
        <include refid="deviceFields"/>,a.*
        from
        ja_fw_device_maintain_plan a
        left join ja_fw_device b on (a.device_id = b.id)
        left join ja_fw_device b on (a.device_id::VARCHAR = b.id::VARCHAR)
        <where>
            a.is_deleted = 0
            <if test="id != null and id != ''">
@@ -53,12 +54,14 @@

    <select id="selectFwDeviceMaintainPlanPage" resultMap="fwDeviceMaintainPlanResultMap">
        select
            <include refid="deviceFields"/>,a.*
            <include refid="deviceFields"/>,
            a.*
        from
            ja_fw_device_maintain_plan a
        left join ja_fw_device b on (a.device_id = b.id)
        left join
            ja_fw_device b on (a.device_id::VARCHAR = b.id::VARCHAR)
        <where>
            a.is_deleted = 0
                a.is_deleted = 0
            <if test="param2.deviceId != null and param2.deviceId != ''">
                and device_id = #{param2.deviceId}
            </if>
@@ -71,12 +74,18 @@
            <if test="param2.belongDept != null and param2.belongDept != ''">
                and belong_dept = #{param2.belongDept}
            </if>
            <if test="param2.deptList != null and param2.deptList.size > 0">
                and a.create_dept in
                <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
                    #{deptId}
                </foreach>
            </if>
        </where>
    </select>


    <select id="exportFwDeviceMaintainPlan" resultType="org.sxkj.fw.device.excel.FwDeviceMaintainPlanExcel">
        SELECT * FROM ja_fw_device_maintain_plan ${ew.customSqlSegment}
        SELECT *
        FROM ja_fw_device_maintain_plan ${ew.customSqlSegment}
    </select>

</mapper>