Merge remote-tracking branch 'origin/pim_yys'

maven

昨天 b2859e20392f07094ec84166b83e6189665404c2

 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,7 @@
import com.ruoyi.approve.vo.ApproveProcessVO;
import com.ruoyi.project.system.domain.SysDept;

import java.text.ParseException;
import java.util.List;

public interface IApproveProcessService extends IService<ApproveProcess> {
@@ -14,14 +17,14 @@
     * 添加审批流程
     * @param approveProcessVO 审批流程VO对象
     */
    void addApprove(ApproveProcessVO approveProcessVO);
    void addApprove(ApproveProcessVO approveProcessVO) throws ParseException;
    /**
     * 根据部门id查询部门信息
     * @param deptIds 部门ID数组
     */
    List<SysDept> selectDeptListByDeptIds(Long[] deptIds);

    List<ApproveProcess> listAll();
    IPage<ApproveProcess> listAll(Page page, ApproveProcess approveProcess);

    void delApprove(Long[] ids);

@@ -33,5 +36,5 @@
     * 审批状态更新
     * @param approveNode
     */
    void updateApproveProcessStatus(ApproveNode approveNode);
    void updateApproveProcessStatus(ApproveNode approveNode,Integer status);
}