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/service/impl/ServiceReimbursementpayeeServiceImpl.java | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementpayeeServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementpayeeServiceImpl.java
index 0417ba4..48f4b99 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementpayeeServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementpayeeServiceImpl.java
@@ -1,35 +1,30 @@
package com.ruoyi.project.service.impl;
-import java.util.List;
-
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.project.domain.ServiceReimbursementEo;
-import com.ruoyi.project.domain.ServiceReimbursementpayeeShared;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import java.util.ArrayList;
-import java.util.Map;
-
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.project.mapper.ServiceReimbursementpayeeMapper;
+import com.ruoyi.project.domain.ServiceReimbursementEo;
import com.ruoyi.project.domain.ServiceReimbursementpayee;
+import com.ruoyi.project.mapper.ServiceReimbursementpayeeMapper;
import com.ruoyi.project.service.IServiceReimbursementpayeeService;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* 宸梾鎶ラ攢浠樻淇℃伅Service涓氬姟灞傚鐞�
*
* @author ruoyi
- * @date 2023-04-20
+ * @date 2023-05-10
*/
@Service
public class ServiceReimbursementpayeeServiceImpl extends ServiceImpl<ServiceReimbursementpayeeMapper, ServiceReimbursementpayee> implements IServiceReimbursementpayeeService {
@Autowired
private ServiceReimbursementpayeeMapper serviceReimbursementpayeeMapper;
+
/**
* 鏌ヨ宸梾鎶ラ攢浠樻淇℃伅鍒楄〃
@@ -76,6 +71,10 @@
if (serviceReimbursementpayee.getUploadtime() != null) {
wrappers.eq(ServiceReimbursementpayee::getUploadtime, serviceReimbursementpayee.getUploadtime());
}
+
+ if (StringUtils.isNotBlank(serviceReimbursementpayee.getRemark())) {
+ wrappers.eq(ServiceReimbursementpayee::getRemark, serviceReimbursementpayee.getRemark());
+ }
return this.list(wrappers);
}
@@ -86,5 +85,4 @@
}
return serviceReimbursementpayeeMapper.getReimbursementpayeeInfo(serviceReimbursementEo);
}
-
}
--
Gitblit v1.9.3