chenrui
2025-04-07 165050015b3bc1a8a41eed7851d29e2e8d3db187
inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -96,11 +96,28 @@
        GROUP BY ins_sample_id
        ORDER BY ins_sample_id) isu ON isu.ins_sample_id = io.id
        where (io.ifs_inventory_id IS NULL OR TRIM(io.ifs_inventory_id)  = '')
        <if test="isOrderAll != null and isOrderAll != ''">
        <if test="otherParam.isOrderAll != null and otherParam.isOrderAll != ''">
            AND io.state in (1, 4)
        </if>
        <if test="laboratory!=null and laboratory!=''">
            AND io.laboratory=#{laboratory}
        <if test="otherParam.laboratory!=null and otherParam.laboratory!=''">
            AND io.laboratory=#{otherParam.laboratory}
        </if>
        <if test="otherParam.checkUserFlag != null and otherParam.checkUserFlag and otherParam.checkUserId != null ">
            AND io.id IN (
                SELECT DISTINCT
                ins_sample_id AS orderId
                FROM
                ins_sample_user
                WHERE
                user_id = #{otherParam.checkUserId} UNION
                SELECT
                T2.ins_order_id AS orderId
                FROM
                ins_product T1
                JOIN ins_sample T2 ON T1.ins_sample_id = T2.id
                WHERE
                T1.check_user_id = #{otherParam.checkUserId}
            )
        </if>
        GROUP BY io.id,type
        order by type desc,io.id desc