From 113cd73922b9b67c261c19c744e46eb2822d7b41 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 14 十一月 2025 14:54:11 +0800
Subject: [PATCH] Merge branch 'prod' into dev_tide
---
src/main/resources/mapper/warehouse/DocumentationReturnManagementMapper.xml | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 57 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/warehouse/DocumentationReturnManagementMapper.xml b/src/main/resources/mapper/warehouse/DocumentationReturnManagementMapper.xml
new file mode 100644
index 0000000..06202f8
--- /dev/null
+++ b/src/main/resources/mapper/warehouse/DocumentationReturnManagementMapper.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.warehouse.mapper.DocumentationReturnManagementMapper">
+
+
+ <select id="listPage" resultType="com.ruoyi.warehouse.dto.DocumentationReturnManagementDto">
+ select dbm.*,doc.doc_name
+ from documentation_return_management dbm
+ LEFT JOIN documentation doc on doc.id = dbm.documentation_id
+ where 1=1
+ <if test="documentationReturnManagement.borrowStatus != null">
+ and borrow_status = #{documentationReturnManagement.borrowStatus}
+ </if>
+ <if test="documentationReturnManagement.documentationId != null">
+ and documentation_id = #{documentationReturnManagement.documentationId}
+ </if>
+ <if test="documentationReturnManagement.borrower != null">
+ and borrower like concat('%',#{documentationReturnManagement.borrower},'%')
+ </if>
+ <if test="documentationReturnManagement.returner != null">
+ and returner like concat('%',#{documentationReturnManagement.returner},'%')
+ </if>
+ <if test="documentationReturnManagement.entryDateStart != null and documentationReturnManagement.entryDateStart != ''">
+ and return_date >= DATE_FORMAT(#{documentationReturnManagement.entryDateStart},'%Y-%m-%d')
+ </if>
+ <if test="documentationReturnManagement.entryDateEnd != null and documentationReturnManagement.entryDateEnd != ''">
+ and return_date <= DATE_FORMAT(#{documentationReturnManagement.entryDateEnd},'%Y-%m-%d')
+ </if>
+ </select>
+
+ <select id="exportrevent" resultType="com.ruoyi.warehouse.dto.ReturnExportDto">
+ select dbm.*,doc.doc_name
+ from documentation_return_management dbm
+ LEFT JOIN documentation doc on doc.id = dbm.documentation_id
+ where dbm.returner IS NOT NULL
+ <if test="documentationReturnManagement.borrowStatus != null">
+ and borrow_status = #{documentationReturnManagement.borrowStatus}
+ </if>
+ <if test="documentationReturnManagement.documentationId != null">
+ and documentation_id = #{documentationReturnManagement.documentationId}
+ </if>
+ <if test="documentationReturnManagement.borrower != null">
+ and borrower like concat('%',#{documentationReturnManagement.borrower},'%')
+ </if>
+ <if test="documentationReturnManagement.returner != null">
+ and returner like concat('%',#{documentationReturnManagement.returner},'%')
+ </if>
+ <if test="documentationReturnManagement.entryDateStart != null and documentationReturnManagement.entryDateStart != ''">
+ and return_date >= DATE_FORMAT(#{documentationReturnManagement.entryDateStart},'%Y-%m-%d')
+ </if>
+ <if test="documentationReturnManagement.entryDateEnd != null and documentationReturnManagement.entryDateEnd != ''">
+ and return_date <= DATE_FORMAT(#{documentationReturnManagement.entryDateEnd},'%Y-%m-%d')
+ </if>
+ </select>
+</mapper>
--
Gitblit v1.9.3