修改完善1

yaowanxin

5 天以前 73e27a267afa5eb2c94b3c70aa3556aaef690cea

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

@@ -4,61 +4,51 @@
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.warehouse.mapper.DocumentationMapper">

    <resultMap id="BaseResultMap" type="com.ruoyi.warehouse.pojo.Documentation">
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="categoryName" column="category_name" jdbcType="VARCHAR"/>
            <result property="docName" column="doc_name" jdbcType="VARCHAR"/>
            <result property="docNumber" column="doc_number" jdbcType="BIGINT"/>
            <result property="year" column="year" jdbcType="BIGINT"/>
            <result property="responsiblePerson" column="responsible_person" jdbcType="VARCHAR"/>
            <result property="warehouseGoodsShelvesRowcolId" column="warehouse_goods_shelves_rowcol_id" jdbcType="BIGINT"/>
            <result property="docDate" column="doc_date" jdbcType="TIMESTAMP"/>
            <result property="retentionPeriod" column="retention_period" jdbcType="BIGINT"/>
            <result property="securityLevel" column="security_level" jdbcType="VARCHAR"/>
            <result property="copyCount" column="copy_count" jdbcType="BIGINT"/>
            <result property="pageCount" column="page_count" jdbcType="BIGINT"/>
            <result property="docCategory" column="doc_category" jdbcType="VARCHAR"/>
            <result property="docType" column="doc_type" jdbcType="VARCHAR"/>
            <result property="urgencyLevel" column="urgency_level" jdbcType="VARCHAR"/>
            <result property="docStatus" column="doc_status" jdbcType="VARCHAR"/>
            <result property="remark" column="remark" jdbcType="VARCHAR"/>
            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
            <result property="createUser" column="create_user" jdbcType="VARCHAR"/>
            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
            <result property="updateUser" column="update_user" jdbcType="VARCHAR"/>
            <result property="tenantId" column="tenant_id" jdbcType="BIGINT"/>
    </resultMap>

    <sql id="Base_Column_List">
        id,category_name,doc_name,
        doc_number,year,responsible_person,
        warehouse_goods_shelves_rowcol_id,doc_date,retention_period,
        security_level,copy_count,page_count,
        doc_category,doc_type,urgency_level,
        doc_status,remark,create_time,
        create_user,update_time,update_user,
        tenant_id
    </sql>
    <select id="listPage" resultType="com.ruoyi.warehouse.pojo.Documentation">
        select * from documentation
    <select id="listPage" resultType="com.ruoyi.warehouse.dto.DocumentationDto">
        SELECT
        doc.*,
        dc.category,
        CONCAT(
            w.warehouse_name, '-',
            wgs.name, '-',
            wgsr.row, '层-',
            wgsr.col, '列'
        ) AS location_info  -- 合并后的字段名
        FROM documentation doc
        LEFT JOIN document_classification dc ON doc.document_classification_id = dc.id
        LEFT JOIN warehouse_goods_shelves_rowcol wgsr ON wgsr.id = doc.warehouse_goods_shelves_rowcol_id
        LEFT JOIN warehouse_goods_shelves wgs ON wgs.id = wgsr.warehouse_goods_shelves_id
        LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
        where 1=1
        <if test="documentation.categoryName != null">
            and category_name = #{documentation.categoryName}
        <if test="documentation.documentClassificationId != null">
            and doc.document_classification_id = #{documentation.documentClassificationId}
        </if>
        <if test="documentation.docName != null">
            and doc_name = #{documentation.docName}
            and doc.doc_name = #{documentation.docName}
        </if>
        <if test="documentation.docNumber != null">
            and doc_number = #{documentation.docNumber}
            and doc.doc_number = #{documentation.docNumber}
        </if>
        <if test="documentation.warehouse_goods_shelves_rowcol_id != null">
            and warehouse_goods_shelves_rowcol_id = #{documentation.warehouseGoodsShelvesRowcolId}
        <if test="documentation.id != null">
            and doc.id = #{documentation.id}
        </if>
    </select>
    <select id="list" resultType="com.ruoyi.warehouse.pojo.Documentation">
        select * from documentation t1
              left join warehouse_goods_shelves_rowcol t2 on t1.warehouse_goods_shelves_rowcol_id = t2.id
              left join warehouse_goods_shelves t3 on t2.warehouse_goods_shelves_id = t3.id
              left join warehouse t4 on t2.warehouse_id = t4.id
    <select id="listByDocumentClassificationId" resultType="com.ruoyi.warehouse.dto.DocumentationDto">
        SELECT
        doc.*,
        dc.category,
        CONCAT(
        w.warehouse_name, '-',
        wgs.name, '-',
        wgsr.row, '层-',
        wgsr.col, '列'
        ) AS location_info  -- 合并后的字段名
        FROM documentation doc
        LEFT JOIN document_classification dc ON doc.document_classification_id = dc.id
        LEFT JOIN warehouse_goods_shelves_rowcol wgsr ON wgsr.id = doc.warehouse_goods_shelves_rowcol_id
        LEFT JOIN warehouse_goods_shelves wgs ON wgs.id = wgsr.warehouse_goods_shelves_id
        LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
        where doc.document_classification_id = #{documentClassificationId}
    </select>

</mapper>