From 16bdbf16d96fa37732ad6c447db6c39821b5b432 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 17 五月 2023 17:22:07 +0800
Subject: [PATCH] 给专家劳务，加一下排序
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 bebe86e..7489267 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
@@ -138,7 +138,12 @@
//startPage();
List<SpFinancialExpensesFundOut> list = serviceFundService.getListBypower(loginUser.getUsername(), 2, APPLICANT, APPLICATIONBEGTIME, APPLICATIONENDTIME, loginUser.getDeptId().toString(), CHECKFLAG, APPLYTYPE);
- //return getDataTable(list);
+ Collections.sort(list, new Comparator<SpFinancialExpensesFundOut>() {
+ @Override
+ public int compare(SpFinancialExpensesFundOut o1, SpFinancialExpensesFundOut o2) {
+ return o2.getCreateTime().compareTo(o1.getCreateTime());
+ }
+ });
return getCustomDataTable(list, pageNum, pageSize);
}
@@ -526,6 +531,7 @@
if (TotalLevel == OriginalFlowLevel + 1) {
ServiceFundShared serviceFundShared = DtoConversionUtils.sourceToTarget(serviceFund, ServiceFundShared.class);
serviceFundShared.setId(null);
+ serviceFundShared.setSerfunid(serviceFund.getId());
serviceFundShared.setAmountrequested(new BigDecimal(serviceFund.getAmountrequested()));
serviceFundShared.setPrepaidamount(new BigDecimal(serviceFund.getPrepaidamount()));
serviceFundShared.setTotalcost(new BigDecimal(serviceFund.getTotalcost()));
@@ -543,13 +549,15 @@
List<ServiceFunddetail> serviceFunddetails = serviceFunddetailMapper.selectByMap(columnMap);
List<ServiceFunddetailShared> serviceFunddetailShareds = DtoConversionUtils.sourceToTarget(serviceFunddetails, ServiceFunddetailShared.class);
for (int i = 0; i < serviceFunddetails.size(); i++) {
- serviceFunddetailShareds.get(i).setFundid(serviceFunddetails.get(i).getFundid());
+ serviceFunddetailShareds.get(i).setFundid(serviceFundShared.getId());
+ serviceFunddetailShareds.get(i).setFdid(serviceFunddetails.get(i).getId());
serviceFunddetailShareds.get(i).setAmount(new BigDecimal(serviceFunddetails.get(i).getAmount()));
serviceFunddetailShareds.get(i).setPrepaidamount(new BigDecimal(serviceFunddetails.get(i).getPrepaidamount()));
serviceFunddetailShareds.get(i).setTaxamount(new BigDecimal(serviceFunddetails.get(i).getTaxamount()));
serviceFunddetailShareds.get(i).setTaxedamount(new BigDecimal(serviceFunddetails.get(i).getTaxedamount()));
serviceFunddetailShareds.get(i).setQuantity(new BigDecimal(serviceFunddetails.get(i).getQuantity()));
serviceFunddetailShareds.get(i).setPrice(new BigDecimal(serviceFunddetails.get(i).getPrice()));
+ serviceFunddetailShareds.get(i).setId(null);
}
funddetailSharedService.saveBatch(serviceFunddetailShareds);
--
Gitblit v1.9.3