blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
廖井涛
2024-09-27 c26d3f181ddd40a23aaef5bbbd5f0fcf1683d68a 
 north-glass-erp/src/main/resources/mapper/pp/Report.xml


@@ -251,6 +251,12 @@


        <if test="crossProcessBreakingDTO.responsibleTeam != null and crossProcessBreakingDTO.responsibleTeam != ''">


            and dd.responsible_team regexp #{crossProcessBreakingDTO.responsibleTeam}


        </if>


        <if test="crossProcessBreakingDTO.glassChild != null and crossProcessBreakingDTO.glassChild != ''">


            and ogd.glass_child regexp #{crossProcessBreakingDTO.glassChild}


        </if>


        <if test="crossProcessBreakingDTO.breakageType != null and crossProcessBreakingDTO.breakageType != ''">


            and dd.breakage_type regexp #{crossProcessBreakingDTO.breakageType}


        </if>


        GROUP BY dd.id


        order by dd.id desc


        limit #{offset},#{pageSize}


@@ -490,7 +496,7 @@


        rw.process_id,


        dd.order_number,


        dd.technology_number,


        date(rw.reporting_work_time) as reporting_work_time,


        rw.reporting_work_time as reporting_work_time,


        dd.responsible_process,


        dd.responsible_team,


        dd.responsible_equipment,


@@ -543,6 +549,9 @@


        <if test="damageReportDTO.breakageReason != null and damageReportDTO.breakageReason != ''">


            and dd.breakage_reason regexp #{damageReportDTO.breakageReason}


        </if>


        <if test="damageReportDTO.glassChild != null and damageReportDTO.glassChild != ''">


            and ogd.glass_child regexp #{damageReportDTO.glassChild}


        </if>


        GROUP BY


        dd.id


        limit #{offset},#{pageSize};


@@ -593,7 +602,9 @@


        <if test="damageReportDTO.breakageReason != null and damageReportDTO.breakageReason != ''">


            and dd.breakage_reason regexp #{damageReportDTO.breakageReason}


        </if>




        <if test="damageReportDTO.glassChild != null and damageReportDTO.glassChild != ''">


            and ogd.glass_child regexp #{damageReportDTO.glassChild}


        </if>


        limit #{offset},#{pageSize};


    </select>