From 9d5128803ebebb5788f13924a5775ac16494dfef Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 18 八月 2025 10:05:05 +0800
Subject: [PATCH] 仓库，树，文档，借出修改
---
src/main/resources/mapper/warehouse/DocumentationMapper.xml | 83 +++++++++++++++++++----------------------
1 files changed, 38 insertions(+), 45 deletions(-)
diff --git a/src/main/resources/mapper/warehouse/DocumentationMapper.xml b/src/main/resources/mapper/warehouse/DocumentationMapper.xml
index 768e272..bf0b122 100644
--- a/src/main/resources/mapper/warehouse/DocumentationMapper.xml
+++ b/src/main/resources/mapper/warehouse/DocumentationMapper.xml
@@ -4,58 +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="documentClassificationId" column="document_classification_id"/>
- <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.goods_shelves_name, '-',
+ wgsr.storey, '灞�-',
+ wgsr.arrange, '鍒�'
+ ) 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.documentClassificationId != null">
- and document_classification_id = #{documentation.documentClassificationId}
+ 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.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 t3.warehouse_id = t4.id
+ <select id="listByDocumentClassificationId" resultType="com.ruoyi.warehouse.dto.DocumentationDto">
+ SELECT
+ doc.*,
+ dc.category,
+ CONCAT(
+ w.warehouse_name, '-',
+ wgs.goods_shelves_name, '-',
+ wgsr.storey, '灞�-',
+ wgsr.arrange, '鍒�'
+ ) 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>
--
Gitblit v1.9.3