Merge remote-tracking branch 'origin/master'

fuliqi

2024-08-21 26b03b6720fe222be3fdad7931a94a4842dca0c2

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

@@ -60,6 +60,14 @@
                    FROM t_report
                    WHERE id = #{id} AND deleted = 0
            ) as rr ON r.identify = rr.identify AND r.create_time <= rr.create_time
        ORDER BY
            r.create_time DESC
    </select>

    <select id="selectNumberList" resultType="java.lang.String">
        SELECT yp.serial_number FROM t_report r
        LEFT JOIN t_yw_point yp ON r.point_id = yp.id
        WHERE r.status = #{status} AND
              #{date} between r.begin_create_time and r.end_create_time
    </select>
</mapper>