a5ef1518e11684ec903cbe0b6952403ef9297d0e..e70eb0a8b1330eacd21ce17478f04fde3b8f7939
2025-05-20 k94314517
Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
e70eb0 对比 | 目录
2025-05-20 k94314517
git ch
a4cc26 对比 | 目录
已修改2个文件
10 ■■■■ 文件已修改
server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java
@@ -246,9 +246,12 @@
    @ExcelColumn(name="核赔所有赔付项信息")
    private String hpAccountContent;
    @ApiModelProperty(value = "核赔总金额")
    @ApiModelProperty(value = "核赔主要金额")
    private BigDecimal hpAccount;
    @ApiModelProperty(value = "核赔其他金额")
    private BigDecimal hpOtherAccount;
    @ApiModelProperty(value = "保险单附件")
    @TableField(exist = false)
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);