From 2e85e2dda945ca269d87b7f1f6147246be9accfa Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 18 八月 2025 13:21:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim_yys'

---
 src/main/java/com/ruoyi/approve/service/IApproveProcessService.java |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/ruoyi/approve/service/IApproveProcessService.java b/src/main/java/com/ruoyi/approve/service/IApproveProcessService.java
index 5ed770d..675c474 100644
--- a/src/main/java/com/ruoyi/approve/service/IApproveProcessService.java
+++ b/src/main/java/com/ruoyi/approve/service/IApproveProcessService.java
@@ -1,5 +1,7 @@
 package com.ruoyi.approve.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.approve.pojo.ApproveNode;
 import com.ruoyi.approve.pojo.ApproveProcess;
@@ -7,6 +9,8 @@
 import com.ruoyi.approve.vo.ApproveProcessVO;
 import com.ruoyi.project.system.domain.SysDept;
 
+import java.io.IOException;
+import java.text.ParseException;
 import java.util.List;
 
 public interface IApproveProcessService extends IService<ApproveProcess> {
@@ -14,24 +18,19 @@
      * 娣诲姞瀹℃壒娴佺▼
      * @param approveProcessVO 瀹℃壒娴佺▼VO瀵硅薄
      */
-    void addApprove(ApproveProcessVO approveProcessVO);
+    void addApprove(ApproveProcessVO approveProcessVO) throws  Exception;
     /**
      * 鏍规嵁閮ㄩ棬id鏌ヨ閮ㄩ棬淇℃伅
      * @param deptIds 閮ㄩ棬ID鏁扮粍
      */
     List<SysDept> selectDeptListByDeptIds(Long[] deptIds);
 
-    List<ApproveProcess> listAll();
+    IPage<ApproveProcess> listAll(Page page, ApproveProcess approveProcess);
 
     void delApprove(Long[] ids);
 
-    void updateByApproveId(ApproveGetAndUpdateVo approveGetAndUpdateVo);
+    void updateByApproveId(ApproveGetAndUpdateVo approveGetAndUpdateVo) throws IOException;
 
     ApproveProcess getApproveById(String id);
 
-    /**
-     * 瀹℃壒鐘舵�佹洿鏂�
-     * @param approveNode
-     */
-    void updateApproveProcessStatus(ApproveNode approveNode);
 }

--
Gitblit v1.9.3