bug修改

mitao

2025-04-04 70d2ac8e21669adb1d6ae560ac09bbfe2645de35

bug修改

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

@@ -3,26 +3,37 @@

import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.dto.*;
import com.ruoyi.system.model.TBill;
import com.ruoyi.system.dto.BillStatisticsDto;
import com.ruoyi.system.dto.CachPayDto;
import com.ruoyi.system.dto.OfflinePayCheckDto;
import com.ruoyi.system.dto.SmsByBillDto;
import com.ruoyi.system.dto.TBillDto;
import com.ruoyi.system.dto.TbillSaveDto;
import com.ruoyi.system.model.TBillConfirm;
import com.ruoyi.system.model.TBillDetail;
import com.ruoyi.system.model.TContract;
import com.ruoyi.system.query.TBillQuery;
import com.ruoyi.system.query.TContractQuery;
import com.ruoyi.system.service.*;
import com.ruoyi.system.service.TBillConfirmService;
import com.ruoyi.system.service.TBillDetailService;
import com.ruoyi.system.service.TBillService;
import com.ruoyi.system.service.TContractService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import javax.validation.constraints.NotEmpty;
import java.util.List;
import java.util.Objects;

/**
 * <p>
@@ -70,7 +81,14 @@
    @PostMapping("add")
    @ApiOperation("新增账单")
    public R<PageInfo<TBillDto>> add(@Validated @RequestBody TbillSaveDto bill){
        bill.setBusinessDeptId(SecurityUtils.getBusinessDeptId());
        String businessDeptId = SecurityUtils.getBusinessDeptId();
        if (SecurityUtils.getBusinessDeptId().equals("0")) {
            TContract contract = contractService.getById(bill.getContractId());
            if (Objects.nonNull(contract)) {
                businessDeptId = contract.getBusinessDeptId();
            }
        }
        bill.setBusinessDeptId(businessDeptId);
        tBillService.saveBill(bill);
        return R.ok();
    }

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

@@ -379,7 +379,7 @@
        if (StringUtils.isNotEmpty(contractId)) {
            firstBill = billService.lambdaQuery()
                    .eq(TBill::getContractId, contractId)
                    .orderByDesc(TBill::getStartTime)
                    .orderByAsc(TBill::getStartTime)
                    .last("limit 1")
                    .one();
            tCheckAcceptRecord = checkAcceptRecordService.lambdaQuery()
@@ -407,6 +407,7 @@
            fill(templateParam, "bankNumber", tenant.getBankNumber());
            fill(templateParam, "bankName", tenant.getBankName());
            fill(templateParam, "partyTwoName", tenant.getLessee());
            fill(templateParam, "email", tenant.getEmail());

            // 企业、政府机构、国有企业
            if (Objects.nonNull(tenant.getTenantType())
@@ -470,7 +471,13 @@

        // 首期租金处理
        if (firstBill != null) {
            fill(templateParam, "firstRent", "￥" + firstBill.getPayableFeesMoney() + "元");
            double 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, "firstRent", "￥" + firstRent + "元");
        } else {
            fill(templateParam, "firstRent", "");
        }

 ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml

@@ -88,7 +88,7 @@
    </select>
    <select id="getRentedArea" resultType="java.lang.Double">
        SELECT COALESCE(SUM(t1.house_area),0) FROM t_house t1
        LEFT JOIN t_contract t2 ON t1.id = t2.house_id
        LEFT JOIN t_contract t2 ON t1.id = t2.house_id AND t2.status = 4
        <where>
            t2.pay_type = 2 AND t1.lease_status != 1
            <if test="businessDeptId!=0">