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

chenlu

2024-07-17 59958f4c35abc1ae902a87dfb56f6dbadd36ad49

 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
@@ -474,6 +477,7 @@
                           from reporting_work as rw
                           left join  reporting_work_detail  as rwd
                           on rw.reporting_work_id = rwd.reporting_work_id
              where rw.reviewed_state>=0
                           group by rw.process_id,
                                    rw.this_process,
                                    rwd.order_number,
@@ -784,4 +788,8 @@
        where rw.process_id = #{substring} and rw.this_process=#{process}
          and rwd.technology_number = #{result} and reviewed_state=0
    </update>

    <select id="getPatchConditionMp">
        select count(*) from damage_details where reporting_work_id=#{reportingWorkId} and patch_status>0
    </select>
</mapper>