Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

jiangping

2025-05-20 81873468b3453cab461b98368a630d7bcf97a15c

Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

# Conflicts:
#	server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java

 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;

 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);