From 762ba4819b1d8da88c57b8a1a6ef07dd15d798ca Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 20 五月 2025 11:34:27 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
index a8a4c2b..cad88af 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
@@ -408,6 +408,20 @@
settleClaims.setCreator(loginUserInfo.getId());
//
List<SettleClaimsMoneyVO> feeList = settleClaims.getAccountList();
+ BigDecimal mainFee = new BigDecimal(0);
+ BigDecimal ortherFee = new BigDecimal(0);
+ if(feeList!=null && feeList.size()>0){
+ for(SettleClaimsMoneyVO fee : feeList){
+ if(Constants.equalsObject(fee.getType(),Constants.ZERO)){
+ mainFee = mainFee.add(Constants.formatBigdecimal(fee.getMoney()));
+ }else{
+ ortherFee = ortherFee.add(Constants.formatBigdecimal(fee.getMoney()));
+ }
+ }
+ settleClaims.setHpAccountContent(JSONObject.toJSONString(feeList));
+ settleClaims.setHpAccount(mainFee);
+ settleClaims.setHpOtherAccount(ortherFee);
+ }
settleClaimsMapper.insert(settleClaims);
@@ -1950,7 +1964,10 @@
update.setEditDate(new Date());
update.setEditor(loginUserInfo.getId());
update.setHpAccountContent(dto.getCompensationJson());
- update.setHpAccount(modelList.stream().map(i->i.getFee()).reduce(BigDecimal.ZERO,BigDecimal::add));
+ update.setHpAccount(modelList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)).map(i->i.getFee()).reduce(BigDecimal.ZERO,BigDecimal::add));
+ update.setHpOtherAccount(modelList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.TWO)).map(i->i.getFee()).reduce(BigDecimal.ZERO,BigDecimal::add));
+
+
update.setId(settleClaims.getId());
update.setStatus(Constants.SettleClaimsStatus.COMPENSATION.getKey());
settleClaimsMapper.updateById(update);
--
Gitblit v1.9.3