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

廖井涛

2024-07-17 87c9e137575b5820754ebd9edea78f2c1f57ab13

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

@@ -153,9 +153,12 @@
        left join (
                select ifnull(sum(a.patch_num),0) as patch_num,a.process_id,a.technology_number,a.order_sort
                from patch_log as a
                where a.process_id=#{processIdStr}
                right join  reporting_work
                on a.reporting_work_id=reporting_work.reporting_work_id
                where
                reporting_work.this_process = #{process}
                and a.process_id=#{processIdStr}
                and a.technology_number =  #{technologyStr}
                and a.patch_processes = #{process}
                and a.review_status = 1
                group by a.process_id,a.order_sort,a.technology_number
            ) as patch