Merge remote-tracking branch 'origin/master'

zss

2024-07-24 7c331e84a7151c943d900b34fbd57475d69cdc27

 inspect-server/src/main/resources/mapper/InsOrderMapper.xml

@@ -456,4 +456,18 @@
        from department_lims
        where id = #{depLimsId}
    </select>

    <select id="getDeviceMessage" resultType="java.util.Map">
        select d.device_name, d.management_number
        FROM
            device d,
            structure_item_parameter sip
        where d.ip = #{ip}
          and sip.inspection_item = #{inspectionItem}
            <if test="inspectionItemSubclass != '' and inspectionItemSubclass != null">
                and sip.inspection_item_subclass = #{inspectionItemSubclass}
            </if>
          and d.device_status = 0
          and d.ins_product_ids is not null
    </select>
</mapper>