Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2025-02-12 a25fbec4ca4ca2009b7dacaaf0882c4be9dc898c

Merge branch 'master' of http://bore.pub:10439/r/ERP_override

 north-glass-erp/src/main/resources/mapper/pp/Report.xml

@@ -612,6 +612,9 @@
        <if test="damageReportDTO.glassChild != null and damageReportDTO.glassChild != ''">
            and ogd.glass_child regexp #{damageReportDTO.glassChild}
        </if>
        <if test="damageReportDTO.glassNumber != null and damageReportDTO.glassNumber != ''">
            and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{damageReportDTO.glassNumber}
        </if>
        GROUP BY
        dd.id
        limit #{offset},#{pageSize};