From 2c456094bdf1cc7e1bab5e0dbee00bb1f2743488 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 17 七月 2023 13:50:12 +0800
Subject: [PATCH] 1、审批顺序:审批时,从一级到五级逐级审批,回退时,由审批人员指定回退级别,如从五级审批退回到经办人(需要重新修改材料的人员处),每一级可以看到回退的信息;修改完成后,直接从经办人处到达五级审批或退回的审批人。被退回的信息修改完成后,直接从经办人到达五级审批或退回的审批人处,那么其他层级的审批人虽然不需要审批,但要能够看到重新修改后的信息。 说明: (1)差旅费报销主表:service_reimbursement 标识字段:FlowLevel(当前审核级别 处于哪个阶段 0:申请;1:一级审核;2:二级审核;3:三级审核等; 4:四级审核等;  5:五级审核等);RecordStatus(记录状态 详见字典sys_travelexpensestatus) (2)费用报销主表:service_fund 标识字段:FlowLevel(当前审核级别 处于哪个阶段 0:申请;1:一级审核;2:二级审核;3:三级审核等; 4:四级审核等;  5:五级审核等);RecordStatus(记录状态 详见字典sys_travelexpensestatus) (3)审批流程设置表:service_fundflowrule (4)审批流程记录表:service_fundflow

---
 ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceReimbursementMapper.java |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceReimbursementMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceReimbursementMapper.java
index bf09d3e..233adcc 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceReimbursementMapper.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceReimbursementMapper.java
@@ -2,20 +2,24 @@
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
 import java.util.List;
+
 import com.ruoyi.project.domain.ServiceReimbursement;
+import com.ruoyi.project.domain.ServiceReimbursementEo;
 import com.ruoyi.project.domain.dto.ServiceReimbursementDto;
 import com.ruoyi.project.domain.vo.SpFinancialExpensesReimbursementOut;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 /**
  * 鎶ラ攢鐢宠Mapper鎺ュ彛
- * 
+ *
  * @author ruoyi
  * @date 2022-01-24
  */
-public interface ServiceReimbursementMapper extends BaseMapper<ServiceReimbursement>
-{
+@Mapper
+public interface ServiceReimbursementMapper extends BaseMapper<ServiceReimbursement> {
     /**
      * 鏌ヨ鎶ラ攢鐢宠鍒楄〃
      *
@@ -28,9 +32,16 @@
 
     List<ServiceReimbursement> selectSearchList(ServiceReimbursementDto serviceReimbursementdto);
 
-    List<SpFinancialExpensesReimbursementOut> getListBypower(@Param("PAUSERNO")  String PAUSERNO,@Param("PAFUNDTYPE")  Integer PAFUNDTYPE,@Param("PAAPPLICANT")  String PAAPPLICANT,@Param("PAAPPLICATIONBEGTIME")   String PAAPPLICATIONBEGTIME,@Param("PAAPPLICATIONENDTIME")   String PAAPPLICATIONENDTIME, @Param("PADEPARTMENT")   String PADEPARTMENT,@Param("CHECKFLAG")   Integer CHECKFLAG,@Param("APPLYTYPE")   Integer APPLYTYPE);
+    List<SpFinancialExpensesReimbursementOut> getListBypower(@Param("PAUSERNO") String PAUSERNO, @Param("PAFUNDTYPE") Integer PAFUNDTYPE, @Param("PAAPPLICANT") String PAAPPLICANT, @Param("PAAPPLICATIONBEGTIME") String PAAPPLICATIONBEGTIME, @Param("PAAPPLICATIONENDTIME") String PAAPPLICATIONENDTIME, @Param("PADEPARTMENT") String PADEPARTMENT, @Param("CHECKFLAG") Integer CHECKFLAG, @Param("APPLYTYPE") Integer APPLYTYPE);
 
     List<ServiceReimbursement> getInfoByInfoId(Long infoid);
 
     List<ServiceReimbursement> getInfoByInfoIdRelatives(Long infoid);
+
+    /**
+     * @param serviceReimbursementEo
+     * @return
+     */
+    List<ServiceReimbursementEo> getRDInfoByItem(ServiceReimbursementEo serviceReimbursementEo);
+
 }

--
Gitblit v1.9.3