修改bug

luofl

2025-04-07 0dc15775095a25797daf376e47999f0c11486e75

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java

@@ -135,6 +135,8 @@
        if (Objects.isNull(house)) {
            throw new ServiceException("房产信息不存在");
        }
        house.setRentalReturnStatus("1");
        houseService.updateById(house);
        dto.setBusinessDeptId(house.getBusinessDeptId());
        contractService.save(dto);
        if (dto.getStatus().equals("2")){
@@ -392,6 +394,7 @@
        if (StringUtils.isNotEmpty(contractId)) {
            firstBill = billService.lambdaQuery()
                    .eq(TBill::getContractId, contractId)
                    .eq(TBill::getBillType, 1)
                    .orderByAsc(TBill::getStartTime)
                    .ne(TBill::getManualAddition, DisabledEnum.YES.getCode())
                    .last("limit 1")
@@ -495,9 +498,17 @@
            // 其他财务字段
            fill(templateParam, "firstRentString", "人民币" + NumberToChineseUtils.numberToChinese(firstBill.getPayableFeesMoney().doubleValue()));
        } else {
            fill(templateParam, "firstRent", "");
//            fill(templateParam, "firstRent", "");
        }

        fill(templateParam, "firstRent",
                "￥"+(contract.getPayType().equals("1")
                        ? contract.getMonthRent()
                        :contract.getPayType().equals("2")
                        ?contract.getMonthRent().multiply(new BigDecimal("3"))
                        :contract.getMonthRent().multiply(new BigDecimal("12"))
                        .setScale(2, RoundingMode.DOWN)).doubleValue()+"元");


        fill(templateParam, "firstRentString",
                "人民币"+NumberToChineseUtils.numberToChinese(