From e4750948a3f1db512197faba674a8da8d112be11 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 23 五月 2025 22:27:40 +0800
Subject: [PATCH] yxh
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java | 5 +++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/SpFinancialExpensesIn.java | 13 +++++++------
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 5 ++++-
3 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
index 9f109d1..bd51854 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
@@ -168,7 +168,10 @@
if (StringUtils.isNotEmpty(spFinancialExpensesIn.getDonorname())) {
list = list.stream().filter(obj -> obj.getDonorname().contains(spFinancialExpensesIn.getDonorname())).collect(Collectors.toList());
}
-
+ //閫氳繃涓氬姟缁勮繃婊�
+ if (StringUtils.isNotEmpty(spFinancialExpensesIn.getDeptnos())) {
+ list = list.stream().filter(obj -> obj.getDeptmentno().contains(spFinancialExpensesIn.getDeptnos())).collect(Collectors.toList());
+ }
//閫氳繃閲戦杩囨护
if (spFinancialExpensesIn.getMoney() != null) {
list = list.stream().filter(reimbursementOut -> new BigDecimal(reimbursementOut.getPretaxcost()).compareTo(new BigDecimal(spFinancialExpensesIn.getMoney())) == 0).collect(Collectors.toList());
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 f2140fb..c1cdcf1 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
@@ -164,6 +164,7 @@
if (APPLICATIONENDTIME == null) {
APPLICATIONENDTIME = "";
}
+
//startPage();
List<SpFinancialExpensesReimbursementOut> list = serviceReimbursementService.getListBypower(loginUser.getUsername(), 1, APPLICANT, APPLICATIONBEGTIME, APPLICATIONENDTIME, loginUser.getDeptId().toString(), CHECKFLAG, APPLYTYPE, checkstatus, donorname);
//鏍规嵁缁忓姙浜虹瓫閫�
@@ -175,6 +176,10 @@
list = list.stream().filter(reimbursementOut -> new BigDecimal(reimbursementOut.getAmountrequested()).compareTo(new BigDecimal(spFinancialExpensesIn.getMoney())) == 0).collect(Collectors.toList());
}
+ //鏍规嵁涓氬姟缁勭瓫閫�
+ if (StringUtils.isNotBlank(spFinancialExpensesIn.getDeptnos())) {
+ list = list.stream().filter(reimbursementOut -> reimbursementOut.getDeptmentno().contains(spFinancialExpensesIn.getDeptnos())).collect(Collectors.toList()); // 鎸塶ame瀛楁杩囨护
+ }
//鏍规嵁鍒涘缓鏃堕棿鎺掑簭
Collections.sort(list, new Comparator<SpFinancialExpensesReimbursementOut>() {
@Override
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/SpFinancialExpensesIn.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/SpFinancialExpensesIn.java
index 124bcb1..ebe4dfb 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/SpFinancialExpensesIn.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/SpFinancialExpensesIn.java
@@ -1,14 +1,10 @@
package com.ruoyi.project.domain.vo;
-import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.page.PageDomain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
@Data
public class SpFinancialExpensesIn extends PageDomain {
@@ -70,8 +66,13 @@
private Double money;
/**
- * 閲戦
+ * 棰勫鐘舵��
*/
- @ApiModelProperty("閲戦")
+ @ApiModelProperty("棰勫鐘舵��")
private Integer checkstatus;
+ /**
+ * 涓氬姟缁�
+ */
+ @ApiModelProperty("涓氬姟缁�")
+ private String deptnos;
}
--
Gitblit v1.9.3