From 2f80b7085c4eabce06d3491306b75eecc275275f Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 30 四月 2026 17:31:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/approve/service/IApproveProcessService.java | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/service/IApproveProcessService.java b/src/main/java/com/ruoyi/approve/service/IApproveProcessService.java
index 2606599..49b3508 100644
--- a/src/main/java/com/ruoyi/approve/service/IApproveProcessService.java
+++ b/src/main/java/com/ruoyi/approve/service/IApproveProcessService.java
@@ -3,13 +3,13 @@
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.vo.ApproveProcessVo;
import com.ruoyi.approve.pojo.ApproveProcess;
-import com.ruoyi.approve.vo.ApproveGetAndUpdateVo;
-import com.ruoyi.approve.vo.ApproveProcessVO;
+import com.ruoyi.approve.bean.vo.ApproveGetAndUpdateVo;
+import com.ruoyi.approve.bean.vo.ApproveProcessVO;
import com.ruoyi.project.system.domain.SysDept;
-import java.text.ParseException;
+import java.io.IOException;
import java.util.List;
public interface IApproveProcessService extends IService<ApproveProcess> {
@@ -17,24 +17,19 @@
* 娣诲姞瀹℃壒娴佺▼
* @param approveProcessVO 瀹℃壒娴佺▼VO瀵硅薄
*/
- void addApprove(ApproveProcessVO approveProcessVO) throws ParseException;
+ void addApprove(ApproveProcessVO approveProcessVO) throws Exception;
/**
* 鏍规嵁閮ㄩ棬id鏌ヨ閮ㄩ棬淇℃伅
* @param deptIds 閮ㄩ棬ID鏁扮粍
*/
List<SysDept> selectDeptListByDeptIds(Long[] deptIds);
- IPage<ApproveProcess> listAll(Page page, ApproveProcess approveProcess);
+ IPage<ApproveProcessVo> listAll(Page page, ApproveProcess approveProcess);
- void delApprove(Long[] ids);
+ void delApprove(List<Long> ids);
- void updateByApproveId(ApproveGetAndUpdateVo approveGetAndUpdateVo);
+ void updateByApproveId(ApproveGetAndUpdateVo approveGetAndUpdateVo) throws IOException;
ApproveProcess getApproveById(String id);
- /**
- * 瀹℃壒鐘舵�佹洿鏂�
- * @param approveNode
- */
- void updateApproveProcessStatus(ApproveNode approveNode,Integer status);
}
--
Gitblit v1.9.3