From 256f758a45c9b00a9248b02345ee1d6f52869e08 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 05 十一月 2025 09:36:58 +0800
Subject: [PATCH] yys 1.导出接口开发 2.营销管理-回款登记-回款状态（回款完成，未完成） 3.采购管理-付款登记-加一个付款进度 4.采购管理-付款流水-采购合同号筛选 5.仓储物流-所有-查询条件加一个日期 6.仓储物流-入库管理-加一个库存预警数量字段 7.生产管控-生产订单-加一个订单状态-已完成、未完成 8.协同办公-通知公告-加一个时间限制，过时后状态改为已过期
---
src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml | 23 ++++-------------------
1 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml b/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml
index d29d24a..18b2082 100644
--- a/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml
+++ b/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml
@@ -76,28 +76,13 @@
and borrow_date <= DATE_FORMAT(#{documentationBorrowManagement.entryDateEnd},'%Y-%m-%d')
</if>
</select>
- <select id="exportrevent" resultType="com.ruoyi.warehouse.dto.ReturnExportDto">
+ <select id="list" resultType="com.ruoyi.warehouse.dto.DocumentationBorrowManagementDto">
select dbm.*,doc.doc_name
from documentation_borrow_management dbm
LEFT JOIN documentation doc on doc.id = dbm.documentation_id
- where dbm.returner IS NOT NULL
- <if test="documentationBorrowManagement.borrowStatus != null">
- and borrow_status = #{documentationBorrowManagement.borrowStatus}
- </if>
- <if test="documentationBorrowManagement.documentationId != null">
- and documentation_id = #{documentationBorrowManagement.documentationId}
- </if>
- <if test="documentationBorrowManagement.borrower != null">
- and borrower like concat('%',#{documentationBorrowManagement.borrower},'%')
- </if>
- <if test="documentationBorrowManagement.returner != null">
- and returner like concat('%',#{documentationBorrowManagement.returner},'%')
- </if>
- <if test="documentationBorrowManagement.entryDateStart != null and documentationBorrowManagement.entryDateStart != ''">
- and borrow_date >= DATE_FORMAT(#{documentationBorrowManagement.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="documentationBorrowManagement.entryDateEnd != null and documentationBorrowManagement.entryDateEnd != ''">
- and borrow_date <= DATE_FORMAT(#{documentationBorrowManagement.entryDateEnd},'%Y-%m-%d')
+ <if test="ew != null">
+ ${ew.customSqlSegment}
</if>
</select>
+
</mapper>
--
Gitblit v1.9.3