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

@@ -477,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,
@@ -787,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>