Merge remote-tracking branch 'origin/master'

xiangpei

2024-09-03 d70a64df5d6f7b3b8f68436bd92df8366219981b

 ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml

@@ -96,6 +96,9 @@
            <if test="query.unitId != null">
                AND wo.unit_id = #{query.unitId}
            </if>
            <if test="query.unitId == null">
                AND wo.unit_id is not null
            </if>
            <if test="query.status != null and query.status != ''">
                AND wo.status = #{query.status}
            </if>
@@ -258,6 +261,7 @@

    <select id="getNotFinishedWorkOrders" resultMap="GenWorkOrderMap">
        SELECT
            DISTINCT
            wo.id,
            wo.serial_number,
            wo.status,