From 1453b710856e5b4376de131606a417e63918fe04 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 20 九月 2023 17:07:24 +0800
Subject: [PATCH] 代码删除
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 0a759dd..8ceede6 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
@@ -75,6 +75,9 @@
private IServiceFundService serviceFundService;
@Autowired
+ private IBaseOnlyvalueService baseOnlyvalueService;
+
+ @Autowired
private ISysPostService postService;
@Autowired
@@ -162,13 +165,14 @@
}
//鏍规嵁閲戦绛涢��
if (spFinancialExpensesIn.getMoney() != null) {
- list = list.stream().filter(reimbursementOut -> new BigDecimal(reimbursementOut.getAmountrequested()) == new BigDecimal(spFinancialExpensesIn.getMoney())).collect(Collectors.toList());
+ list = list.stream().filter(reimbursementOut -> new BigDecimal(reimbursementOut.getAmountrequested()).compareTo(new BigDecimal(spFinancialExpensesIn.getMoney())) == 0).collect(Collectors.toList());
+
}
//鏍规嵁鍒涘缓鏃堕棿鎺掑簭
Collections.sort(list, new Comparator<SpFinancialExpensesReimbursementOut>() {
@Override
public int compare(SpFinancialExpensesReimbursementOut o1, SpFinancialExpensesReimbursementOut o2) {
- return o2.getCreateTime().compareTo(o1.getCreateTime());
+ return o1.getCreateTime().compareTo(o2.getCreateTime());
}
});
return getCustomDataTable(list, pageNum, pageSize);
@@ -629,7 +633,7 @@
}
//001瀹℃壒閫氳繃涔嬪悗锛屽氨闇�瑕佹妸鈥滃姙鍏涓讳换鈥濈殑鍚嶅瓧濉笂
- if (checkFundVO.getFlowconclusion() == 1 && user.getUserId().equals("001")) {
+ if (checkFundVO.getFlowconclusion() == 1 && user.getUserName().equals("001")) {
serviceReimbursement.setOfficedirector(user.getNickName());
}
@@ -900,6 +904,7 @@
String date = formatter.format(dt);
String time = date.substring(0, 10);
+ dataMap.put("ZB", rdInfoByItem.get(0).getDeptmentname() == null ? "" : rdInfoByItem.get(0).getDeptmentname());
dataMap.put("XZBH", rdInfoByItem.get(0).getBh() == null ? "" : rdInfoByItem.get(0).getBh());
dataMap.put("TBYYMMDD", time);
dataMap.put("BXDFJ", rdInfoByItem.get(0).getAttachcount() == null ? " " : "" + rdInfoByItem.get(0).getAttachcount());
--
Gitblit v1.9.3