From 6892c31200a7ed1b0e60ee5aff794b1fcecc7ef6 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 01 十一月 2023 16:28:06 +0800
Subject: [PATCH] 解决文件上传时，文件名重复问题
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
index 87f9310..1a1ff24 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
@@ -135,8 +135,10 @@
String APPLICATIONENDTIME = spFinancialExpensesIn.getAPPLICATIONENDTIME();
Integer CHECKFLAG = spFinancialExpensesIn.getCHECKFLAG();
Integer APPLYTYPE = spFinancialExpensesIn.getAPPLYTYPE();
+ Integer checkstatus = spFinancialExpensesIn.getCheckstatus();
Integer pageNum = spFinancialExpensesIn.getPageNum();
Integer pageSize = spFinancialExpensesIn.getPageSize();
+ String donorname = spFinancialExpensesIn.getDonorname();
if (pageNum == null) {
pageNum = 1;
@@ -158,7 +160,7 @@
APPLICATIONENDTIME = "";
}
//startPage();
- List<SpFinancialExpensesReimbursementOut> list = serviceReimbursementService.getListBypower(loginUser.getUsername(), 1, APPLICANT, APPLICATIONBEGTIME, APPLICATIONENDTIME, loginUser.getDeptId().toString(), CHECKFLAG, APPLYTYPE);
+ List<SpFinancialExpensesReimbursementOut> list = serviceReimbursementService.getListBypower(loginUser.getUsername(), 1, APPLICANT, APPLICATIONBEGTIME, APPLICATIONENDTIME, loginUser.getDeptId().toString(), CHECKFLAG, APPLYTYPE,checkstatus,donorname);
//鏍规嵁缁忓姙浜虹瓫閫�
if (StringUtils.isNotBlank(spFinancialExpensesIn.getUsername())) {
list = list.stream().filter(reimbursementOut -> reimbursementOut.getUsername().contains(spFinancialExpensesIn.getUsername())).collect(Collectors.toList()); // 鎸塶ame瀛楁杩囨护
--
Gitblit v1.9.3