add : 吉安支持查询待验收的接口

linwei

7 days ago 3ff3de60e9274da9601fba4d2165fe46be4d7f07

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

@@ -8,7 +8,7 @@
        <result column="work_order_id" property="workOrderId"/>
        <result column="work_order_name" property="workOrderName"/>
        <result column="patrol_task_name" property="patrolTaskName"/>
        <result column="patrol_task_type" property="patrolTaskType"/>
        <result column="patrol_task_type" property="patrolTaskType" typeHandler="org.sxkj.common.handler.GenericListTypeHandler"/>
        <result column="execute_time" property="executeTime"/>
        <result column="patrol_route_url" property="patrolRouteUrl"/>
        <result column="recommend_flyer_name" property="recommendFlyerName"/>
@@ -26,58 +26,68 @@
        <result column="is_deleted" property="isDeleted"/>
        <result column="result_count" property="resultCount"/>
        <result column="issue_event_count" property="issueEventCount"/>
        <result column="algorithm_ids" property="algorithmIds" typeHandler="org.sxkj.common.handler.ListToStringTypeHandler"/>
    </resultMap>


    <select id="selectGdPatrolTaskPage" resultMap="gdPatrolTaskResultMap">
        select
            pt.*,
            md.nickname as device_name,
            wo.work_order_name,
            IFNULL(tr.result_count, 0) as result_count,
            IFNULL(tr.issue_event_count, 0) as issue_event_count
        pt.*,
        md.nickname as device_name,
        wo.work_order_name,
        COALESCE(tr.result_count, 0) as result_count,
        COALESCE(tr.issue_event_count, 0) as issue_event_count
        from
            ja_gd_patrol_task pt
        ja_gd_patrol_task pt
        left join
            ja_gd_work_order wo on pt.work_order_id = wo.id
            ja_gd_work_order wo on pt.work_order_id::VARCHAR = wo.id::VARCHAR
        left join
                ja_gd_manage_device md on md.id = pt.device_id
                ja_gd_manage_device md on md.id::VARCHAR = pt.device_id::VARCHAR
        left join
            (
            select patrol_task_id,
                count(*) as result_count,
                sum(case when distribute_status in (1,2) then 1 else 0 end) as issue_event_count
            from
                ja_gd_task_result
            where
                is_deleted = 0
            group by
                patrol_task_id
            ) tr on tr.patrol_task_id = pt.id
        (
        select patrol_task_id,
        count(*) as result_count,
        sum(case when distribute_status in (1,2) then 1 else 0 end) as issue_event_count
        from
        ja_gd_task_result
        where
        is_deleted = 0
        group by
        patrol_task_id
        ) tr on tr.patrol_task_id::VARCHAR = pt.id::VARCHAR
        <where>
                pt.is_deleted = 0
            pt.is_deleted = 0
            <if test="param2.workOrderId != null and param2.workOrderId != ''">
                and pt.work_order_id = #{param2.workOrderId}
                /* 重点：参数也强制转类型 */
                and pt.work_order_id::VARCHAR = #{param2.workOrderId}::VARCHAR
            </if>
            <if test="param2.patrolTaskName != null and param2.patrolTaskName != ''">
                and pt.patrol_task_name like concat(#{param2.patrolTaskName},'%')
                and pt.patrol_task_name like concat('%',#{param2.patrolTaskName},'%')
            </if>
            <if test="param2.patrolTaskType != null and param2.patrolTaskType != ''">
                and pt.patrol_task_type = #{param2.patrolTaskType}
                /* 将逗号分隔的字符串转换为带引号的格式，如 "road,road1" 转为 "\"road\",\"road1\"" */
                and pt.patrol_task_type like concat('%',
                (
                select string_agg(concat('"', trim(arr_val), '"'), ',')
                from unnest(string_to_array(#{param2.patrolTaskType}, ',')) as arr_val
                ),
                '%')
            </if>
            <if test="param2.taskStatus != null and param2.taskStatus != ''">
                and pt.task_status = #{param2.taskStatus}
                /* 报错信息中出现了这个参数，务必加强转 */
                and pt.task_status::VARCHAR = #{param2.taskStatus}::VARCHAR
            </if>
            <if test="param2.deptList != null and param2.deptList.size > 0">
                and pt.create_dept in
                and pt.create_dept::VARCHAR in
                <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
                    #{deptId}
                    #{deptId}::VARCHAR
                </foreach>
            </if>
            <if test="param2.startTime != null and param2.startTime != '' and param2.endTime != null and param2.endTime != '' ">
                and pt.execute_time BETWEEN #{param2.startTime} AND #{param2.endTime}
                and pt.execute_time BETWEEN #{param2.startTime}::timestamp AND #{param2.endTime}::timestamp
            </if>
        </where>
        order by pt.create_time desc, pt.execute_time asc
    </select>


@@ -85,19 +95,19 @@
        SELECT * FROM ja_gd_patrol_task ${ew.customSqlSegment}
    </select>

    <select id="getPatrolTaskIdById" resultType="org.sxkj.gd.workorder.vo.GdPatrolTaskVO">
    <select id="getPatrolTaskIdById" resultMap="gdPatrolTaskResultMap">
        SELECT
            pt.*,
            md.airport_id as airport_id
        FROM
            ja_gd_patrol_task pt
        left join
                ja_gd_manage_device md on md.id = pt.device_id
        WHERE pt.id = #{patrolTaskId}
                ja_gd_manage_device md on md.id::VARCHAR = pt.device_id::VARCHAR
        WHERE pt.id = #{patrolTaskId}::BIGINT
    </select>


    <select id="getPatrolTaskDetail" resultType="org.sxkj.gd.workorder.vo.GdPatrolTaskVO">
    <select id="getPatrolTaskDetail" resultMap="gdPatrolTaskResultMap">
        SELECT
            pt.*,
            md.airport_id as airport_id,
@@ -109,10 +119,10 @@
        FROM
            ja_gd_patrol_task pt
        left join
            ja_gd_work_order wo on pt.work_order_id = wo.id
            ja_gd_work_order wo on pt.work_order_id::VARCHAR = wo.id::VARCHAR
        left join
            ja_gd_manage_device md on md.id = pt.device_id
        WHERE pt.id = #{id}
            ja_gd_manage_device md on md.id::VARCHAR = pt.device_id::VARCHAR
        WHERE pt.id = #{id}::BIGINT
    </select>

    <select id="getWorkOrderIdById" resultType="org.sxkj.gd.workorder.entity.GdWorkOrderEntity">
@@ -141,4 +151,54 @@
        WHERE id = #{workOrderParam.id}
    </update>

    <!-- 根据工单ID查询巡查任务列表（仅id和名称） -->
    <select id="selectListByWorkOrderId" resultType="org.sxkj.gd.workorder.vo.GdPatrolTaskSimpleVO">
        SELECT id, patrol_task_name AS patrolTaskName
        FROM ja_gd_patrol_task
        WHERE is_deleted = 0
        AND work_order_id = #{workOrderId}::bigint
        ORDER BY create_time DESC
    </select>

    <!-- 查询待验收状态的巡查任务列表（对外接口） -->
    <select id="selectPendingAcceptanceTasks" resultMap="gdPatrolTaskResultMap">
        SELECT
            pt.*,
            md.nickname as device_name,
            wo.work_order_name,
            wo.work_order_status,
            COALESCE(tr.result_count, 0) as result_count,
            COALESCE(tr.issue_event_count, 0) as issue_event_count
        FROM
            ja_gd_patrol_task pt
        LEFT JOIN
            ja_gd_work_order wo ON pt.work_order_id::VARCHAR = wo.id::VARCHAR
        LEFT JOIN
            ja_gd_manage_device md ON md.id::VARCHAR = pt.device_id::VARCHAR
        LEFT JOIN
        (
            SELECT patrol_task_id,
                   COUNT(*) as result_count,
                   SUM(CASE WHEN distribute_status IN (1,2) THEN 1 ELSE 0 END) as issue_event_count
            FROM
                ja_gd_task_result
            WHERE
                is_deleted = 0
            GROUP BY
                patrol_task_id
        ) tr ON tr.patrol_task_id::VARCHAR = pt.id::VARCHAR
        <where>
            pt.is_deleted = 0
            AND wo.is_deleted = 0
            AND wo.work_order_status::VARCHAR &lt;= '40'::VARCHAR
            <if test="queryParam.patrolTaskName != null and queryParam.patrolTaskName != ''">
                AND pt.patrol_task_name LIKE CONCAT('%',#{queryParam.patrolTaskName},'%')
            </if>
            <if test="queryParam.startTime != null and queryParam.startTime != '' and queryParam.endTime != null and queryParam.endTime != ''">
                AND pt.execute_time BETWEEN #{queryParam.startTime}::timestamp AND #{queryParam.endTime}::timestamp
            </if>
        </where>
        ORDER BY pt.create_time DESC, pt.execute_time ASC
    </select>

</mapper>