Merge remote-tracking branch 'origin/master'

linwei

2026-01-20 67961e8f4fdbcd83bf59f8c8bd3f8600618e3d61

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

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

    <!-- 通用查询映射结果 -->
    <resultMap id="gdPatrolTaskResultMap" type="org.sxkj.gd.workorder.entity.GdPatrolTaskEntity">
    <resultMap id="gdPatrolTaskResultMap" type="org.sxkj.gd.workorder.vo.GdPatrolTaskVO">
        <result column="id" property="id"/>
        <result column="work_order_id" property="workOrderId"/>
        <result column="patrol_task_name" property="patrolTaskName"/>
@@ -22,13 +22,26 @@
        <result column="update_time" property="updateTime"/>
        <result column="status" property="status"/>
        <result column="is_deleted" property="isDeleted"/>
        <result column="result_count" property="resultCount"/>
        <result column="issue_event_count" property="issueEventCount"/>
    </resultMap>


    <select id="selectGdPatrolTaskPage" resultMap="gdPatrolTaskResultMap">
        select pt.*, wo.work_order_name
        select pt.*,
               wo.work_order_name,
               IFNULL(tr.result_count, 0) as result_count,
               IFNULL(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 = wo.id
                 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
        <where>
            <if test="param2.workOrderId != null and param2.workOrderId != ''">
                and pt.work_order_id = #{param2.workOrderId}
@@ -42,6 +55,12 @@
            <if test="param2.taskStatus != null and param2.taskStatus != ''">
                and pt.task_status = #{param2.taskStatus}
            </if>
            <if test="param3 != null and param3.size > 0">
                and pt.create_dept in
                <foreach collection="param3" item="deptId" open="(" separator="," close=")">
                    #{deptId}
                </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}
            </if>