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

k94314517

2025-05-20 e70eb0a8b1330eacd21ce17478f04fde3b8f7939

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