From 81873468b3453cab461b98368a630d7bcf97a15c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 20 五月 2025 11:33:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java | 11 ++++++++++-
1 files changed, 10 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..035a377 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,12 @@
settleClaims.setCreator(loginUserInfo.getId());
//
List<SettleClaimsMoneyVO> feeList = settleClaims.getAccountList();
+ if(feeList!=null && feeList.size()>0){
+ for(SettleClaimsMoneyVO fee : feeList){
+
+ }
+ settleClaims.setAccountContent(JSONObject.toJSONString(feeList));
+ }
settleClaimsMapper.insert(settleClaims);
@@ -1950,7 +1956,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