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/dao/business/model/SettleClaims.java | 6 +++++-
server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java | 5 ++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java b/server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java
index 4f5eafa..5c0f182 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java
@@ -246,9 +246,13 @@
@ExcelColumn(name="鏍歌禂鎵�鏈夎禂浠橀」淇℃伅")
private String hpAccountContent;
- @ApiModelProperty(value = "鏍歌禂鎬婚噾棰�")
+ @ApiModelProperty(value = "鏍歌禂涓昏閲戦")
private BigDecimal hpAccount;
+ @ApiModelProperty(value = "鏍歌禂鍏朵粬閲戦")
+ private BigDecimal hpOtherAccount;
+
+
@ApiModelProperty(value = "淇濋櫓鍗曢檮浠�")
@TableField(exist = false)
private Multifile baoxiandanFile;
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 30d16b5..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
@@ -1956,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