From bc82778aa2b8c74fc0946ef6475857d2d9060a9f Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 13 八月 2025 15:35:11 +0800
Subject: [PATCH] 协同办公新增和修改和分页查询增加类型区分
---
src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java | 1 +
src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java | 4 ++++
src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java | 5 +++++
src/main/resources/mapper/approve/ApproveProcessMapper.xml | 3 +++
4 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
index 2c04224..2de1c71 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
@@ -83,6 +83,7 @@
approveProcess.setApproveOverTime(null);
approveProcess.setApproveStatus(0);
approveProcess.setApproveDelete(0);
+ approveProcess.setApproveType(approveProcessVO.getApproveType());
approveProcess.setCreateTime(LocalDateTime.now());
approveProcess.setTenantId(approveProcessVO.getApproveDeptId());
approveProcess.setApproveUserIds(approveProcessVO.getApproveUserIds());
diff --git a/src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java b/src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java
index 98c5d52..31785df 100644
--- a/src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java
+++ b/src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java
@@ -20,4 +20,8 @@
private String approveTime;
private Integer approveStatus;
+ /**
+ * 瀹℃壒绫诲瀷
+ */
+ private Integer approveType;
}
diff --git a/src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java b/src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java
index 8d793d8..3748847 100644
--- a/src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java
+++ b/src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java
@@ -21,4 +21,9 @@
private String approveUserIds;
private String approveReason;
+
+ /**
+ * 瀹℃壒绫诲瀷
+ */
+ private Integer approveType;
}
diff --git a/src/main/resources/mapper/approve/ApproveProcessMapper.xml b/src/main/resources/mapper/approve/ApproveProcessMapper.xml
index 0ab3d21..33b29a9 100644
--- a/src/main/resources/mapper/approve/ApproveProcessMapper.xml
+++ b/src/main/resources/mapper/approve/ApproveProcessMapper.xml
@@ -35,5 +35,8 @@
<if test="req.approveStatus != null or req.approveStatus == 0">
and approve_status = #{req.approveStatus}
</if>
+ <if test="req.approveType != null ">
+ and approve_type = #{req.approveType}
+ </if>
</select>
</mapper>
--
Gitblit v1.9.3