修改完善1

yaowanxin

5 天以前 73e27a267afa5eb2c94b3c70aa3556aaef690cea

 src/main/resources/mapper/warehouse/WarehouseMapper.xml

@@ -5,12 +5,37 @@
<mapper namespace="com.ruoyi.warehouse.mapper.WarehouseMapper">


    <select id="listPage" resultType="com.ruoyi.warehouse.pojo.Warehouse">
    <select id="findList" resultType="com.ruoyi.warehouse.dto.WarehouseDto">
        SELECT
        w.*,
        wgs.name,
        doc.doc_name,
        doc.doc_number,
        dc.category
        FROM warehouse_goods_shelves_rowcol wgsr
        LEFT JOIN warehouse_goods_shelves wgs ON wgs.id = wgsr.warehouse_goods_shelves_id
        LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
        LEFT JOIN documentation doc ON doc.warehouse_goods_shelves_rowcol_id = wgsr.id
        LEFT JOIN document_classification dc ON doc.document_classification_id = dc.id
        <where>
            1=1
            <if test="warehouse.warehouseName != null">
                and w.warehouse_name like concat('%',#{warehouse.warehouseName},'%')
            </if>
            <if test="warehouse.id != null">
                and w.id = #{warehouse.id}
            </if>
        </where>
    </select>
    <select id="listAll" resultType="com.ruoyi.warehouse.pojo.Warehouse">
        select * from warehouse
        <where>
            1=1
            <if test="warehouseName != null">
                and warehouse_name like concat('%',#{warehouseName},'%')
            <if test="warehouse.warehouseName != null">
                and warehouse_name like concat('%',#{warehouse.warehouseName},'%')
            </if>
            <if test="warehouse.id != null">
                and w.id = #{warehouse.id}
            </if>
        </where>
    </select>