From ba4af275c3b8d073f863be7b12e43974b3ef14a2 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 12 七月 2025 10:27:06 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/product-inventory-management-after into pim_ly

---
 src/main/resources/mapper/approve/ApproveProcessMapper.xml |   36 ++++++++++++++++++++++++++++++++++++
 1 files changed, 36 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/approve/ApproveProcessMapper.xml b/src/main/resources/mapper/approve/ApproveProcessMapper.xml
new file mode 100644
index 0000000..3104940
--- /dev/null
+++ b/src/main/resources/mapper/approve/ApproveProcessMapper.xml
@@ -0,0 +1,36 @@
+<?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.approve.mapper.ApproveProcessMapper">
+
+    <resultMap id="BaseResultMap" type="com.ruoyi.approve.pojo.ApproveProcess">
+            <id property="id" column="id" />
+            <result property="approveId" column="approve_id" />
+            <result property="approveUser" column="approve_user" />
+            <result property="approveDeptId" column="approve_dept_id" />
+            <result property="approveDeptName" column="approve_dept_name" />
+            <result property="approveUserIds" column="approve_user_ids" />
+            <result property="approveUserNames" column="approve_user_names" />
+            <result property="approveReason" column="approve_reason" />
+            <result property="approveTime" column="approve_time" />
+            <result property="approveOverTime" column="approve_over_time" />
+            <result property="approveStatus" column="approve_status" />
+            <result property="approveDelete" column="approve_delete" />
+            <result property="tenantId" column="tenant_id" />
+            <result property="approveType" column="approve_type" />
+            <result property="approveRemark" column="approve_remark" />
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,approve_id,approve_user,approve_dept_id,approve_dept_name,approve_user_ids,
+        approve_user_names,approve_reason,approve_time,approve_over_time,approve_status,
+        approve_delete,tenant_id,approve_type,approve_remark
+    </sql>
+    <select id="listPage" resultType="com.ruoyi.approve.pojo.ApproveProcess">
+        select * from approve_process where approve_delete = 0
+        <if test="req.approveId != null and req.approveId != ''">
+            and approve_id like concat('%',#{req.approveId},'%')
+        </if>
+    </select>
+</mapper>

--
Gitblit v1.9.3