sql改造

linwei

2026-02-09 088fe8fb925212aec35d7ea71487108afc269d64

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.xml

@@ -3,7 +3,7 @@
<mapper namespace="org.sxkj.gd.workorder.mapper.GdWorkOrderMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="gdWorkOrderResultMap" type="org.sxkj.gd.workorder.entity.GdWorkOrderEntity">
    <resultMap id="gdWorkOrderResultMap" type="org.sxkj.gd.workorder.vo.GdWorkOrderVO">
        <result column="id" property="id"/>
        <result column="work_order_name" property="workOrderName"/>
        <result column="work_order_code" property="workOrderCode"/>
@@ -39,6 +39,33 @@
               service_party,
               ST_AsText(geom) geom,
               remark,
               reject_reason,
               area_code,
               create_user,
               create_dept,
               create_time,
               update_user,
               update_time,
               status,
               is_deleted
        from ja_gd_work_order
        where id = #{id}
    </select>

    <select id="getWorkOrderByIdWithoutGeom" resultType="org.sxkj.gd.workorder.entity.GdWorkOrderEntity">
        select id,
               work_order_name,
               work_order_code,
               work_order_type,
               device_load_demand,
               recommend_device_ids,
               work_order_status,
               execute_start_time,
               execute_end_time,
               service_party,
               remark,
               ST_AsText(geom) geom,
               reject_reason,
               area_code,
               create_user,
               create_dept,
@@ -54,30 +81,31 @@

    <select id="selectGdWorkOrderPage" resultMap="gdWorkOrderResultMap">
        select
        wo.id,
        wo.work_order_name,
        wo.work_order_code,
        wo.work_order_type,
        wo.device_load_demand,
        wo.recommend_device_ids,
        wo.work_order_status,
        wo.execute_start_time,
        wo.execute_end_time,
        wo.service_party,
        ST_AsText(wo.geom) geom,
        wo.remark,
        wo.area_code,
        wo.create_user,
        wo.create_dept,
        wo.create_time,
        wo.update_user,
        wo.update_time,
        wo.status,
        wo.is_deleted,
        bu.name create_user_name
            wo.id,
            wo.work_order_name,
            wo.work_order_code,
            wo.work_order_type,
            wo.device_load_demand,
            wo.recommend_device_ids,
            wo.work_order_status,
            wo.execute_start_time,
            wo.execute_end_time,
            wo.service_party,
            ST_AsText(wo.geom) geom,
            wo.remark,
            wo.area_code,
            wo.create_user,
            wo.create_dept,
            wo.create_time,
            wo.update_user,
            wo.update_time,
            wo.status,
            wo.is_deleted,
            bu.name create_user_name
        from ja_gd_work_order wo
            left join blade_user bu on wo.create_user = bu.id
        <where>
                and wo.is_deleted = 0
            <if test="param2.workOrderStatus != null and param2.workOrderStatus != ''">
                and wo.work_order_status like concat(#{param2.workOrderStatus},'%')
            </if>
@@ -87,13 +115,18 @@
            <if test="param2.workOrderType != null and param2.workOrderType != ''">
                and wo.work_order_type = #{param2.workOrderType}
            </if>
            <if test="param2.createUser != null and param2.createUser != ''">
            <if test="param2.createUser != null ">
                and wo.create_user = #{param2.createUser}
            </if>
            <if test="param2.startTime != null and param2.startTime != '' and param2.endTime != null and param2.endTime != ''">
                and wo.create_time BETWEEN #{param2.startTime} AND #{param2.endTime}
            </if>
            and wo.is_deleted = 0
            <if test="param2.deptList != null and param2.deptList.size > 0">
                and wo.create_dept in
                <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
                    #{deptId}
                </foreach>
            </if>
        </where>
    </select>

@@ -134,7 +167,7 @@
        VALUES ( #{workOrderParam.workOrderName}, #{workOrderParam.workOrderCode}, #{workOrderParam.workOrderType},
                #{workOrderParam.deviceLoadDemand}, #{workOrderParam.recommendDeviceIds}, #{workOrderParam.workOrderStatus},
                #{workOrderParam.executeStartTime}, #{workOrderParam.executeEndTime}, #{workOrderParam.serviceParty},
                ST_GeomFromText(#{workOrderParam.geom}), #{workOrderParam.remark}, #{workOrderParam.areaCode},
                ST_GeomFromText(#{workOrderParam.geom}, 4326), #{workOrderParam.remark}, #{workOrderParam.areaCode},
                #{workOrderParam.createUser}, #{workOrderParam.createDept}, #{workOrderParam.createTime},
                #{workOrderParam.updateUser}, #{workOrderParam.updateTime}, #{workOrderParam.status}, #{workOrderParam.isDeleted})
    </insert>
@@ -171,7 +204,7 @@
                service_party = #{workOrderParam.serviceParty},
            </if>
            <if test="workOrderParam.geom != null and workOrderParam.geom != ''">
                geom = ST_GeomFromText(#{workOrderParam.geom}),
                geom = ST_GeomFromText(#{workOrderParam.geom}, 4326),
            </if>
            <if test="workOrderParam.remark != null and workOrderParam.remark != ''">
                remark = #{workOrderParam.remark},