Merge remote-tracking branch 'origin/master'

fuliqi

2024-08-21 31d3591b34d4f26ad2ab207ca3044048d9adb9df

 ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml

@@ -47,7 +47,9 @@
            wo.*,
            u.unit_name,
            p.yw_person_name,
            yp.point_tag,
            yp.province_tag,
            yp.important_tag,
            yp.important_command_image_tag,
            odr.create_time as distributeTime,
            su.nick_name as realName
        FROM
@@ -72,7 +74,9 @@
        SELECT
             wo.id,
             wod.create_time,
             yp.point_tag
             yp.province_tag,
             yp.important_tag,
             yp.important_command_image_tag
        FROM
             t_work_order wo
                INNER JOIN t_yw_point yp ON yp.serial_number = wo.serial_number AND yp.deleted = 0
@@ -167,4 +171,14 @@
        ORDER BY d.dept_id
    </select>

    <select id="hasErrorWorkOrderList" resultType="com.ycl.platform.domain.vo.DeviceInfoVO">
        SELECT
               wo.id as workOrderId,
               di.device_id,
               di.channel_id
        FROM
             t_work_order wo
                 INNER JOIN t_device_info di ON wo.serial_number = di.device_id
    </select>

</mapper>