fix：正则修改

龚焕茏

2024-09-03 99ab66a245aeb5b13bdc58e9f130c0a4aef73584

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

@@ -23,6 +23,7 @@
            r.id, r.report_materials, r.create_time, r.report_type, r.report_content, r.status, r.serial_number as pointId,
               r.begin_create_time,
               r.end_create_time,
               r.import_batch_number,
               u.unit_name,
               p.yw_person_name as peopleName,
               pt.point_name,
@@ -40,6 +41,9 @@
        <if test="query.reportType != null and query.reportType != ''">
            AND r.report_type = #{query.reportType}
        </if>
        <if test="query.unitId != null">
            AND r.unit_id = #{query.unitId}
        </if>
        <if test="query.status != null">
            AND r.status = #{query.status}
        </if>
@@ -50,6 +54,7 @@
            r.id, r.report_materials, r.create_time, r.report_type, r.report_content, r.status, r.serial_number,
            r.begin_create_time,
            r.end_create_time,
            r.import_batch_number,
            u.unit_name,
            p.yw_person_name,
            pt.point_name
@@ -89,6 +94,17 @@
        LIMIT 1
    </select>

    <select id="getTogether" resultType="com.ycl.platform.domain.vo.ReportVO">
        SELECT
               r.id,
               p.point_name
        FROM
             t_report r
                 INNER JOIN t_yw_point p ON r.serial_number = p.serial_number
        WHERE
            r.import_batch_number = #{pid} AND r.deleted = 0 AND r.status != 1 AND p.deleted = 0
    </select>