Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/xizang

无关风月

2025-04-10 099ea14bba367fd86f0dde37d908f07cc04c3d39

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

@@ -7,13 +7,9 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.model.TCheckAcceptRecord;
import com.ruoyi.system.model.TContract;
import com.ruoyi.system.model.THouse;
import com.ruoyi.system.model.*;
import com.ruoyi.system.query.TCheckAcceptRecordQuery;
import com.ruoyi.system.service.TCheckAcceptRecordService;
import com.ruoyi.system.service.TContractService;
import com.ruoyi.system.service.THouseService;
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.TCheckAcceptRecordVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -23,9 +19,11 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Objects;

/**
 * <p>
@@ -44,6 +42,10 @@
    private final TContractService contractService;
    private final THouseService houseService;
    @Autowired
    private TBillService billService;
    @Autowired
    private TTenantService tenantService;
    @Autowired
    public TCheckAcceptRecordController(TCheckAcceptRecordService checkAcceptRecordService, TContractService contractService, THouseService houseService) {
        this.checkAcceptRecordService = checkAcceptRecordService;
        this.contractService = contractService;
@@ -53,7 +55,7 @@
    /**
     * 获取验收记录管理列表
     */
    @PreAuthorize("@ss.hasPermi('system:accept:list')")
    @PreAuthorize("@ss.hasPermi('houseManage:check')")
    @ApiOperation(value = "获取验收记录分页列表")
    @PostMapping(value = "/pageList")
    public R<PageInfo<TCheckAcceptRecordVO>> pageList(@RequestBody TCheckAcceptRecordQuery query) {
@@ -68,6 +70,10 @@
    public R<THouse> getHouseByContractId(@RequestParam String contractId) {
        TContract contract = contractService.getById(contractId);
        THouse house = houseService.getById(contract.getHouseId());
        TTenant tenant = tenantService.getById(contract.getTenantId());
        if(Objects.nonNull(tenant)){
            house.setTenantType(tenant.getTenantType());
        }
        return R.ok(house);
    }

@@ -88,7 +94,7 @@
    /**
     * 添加验收记录管理
     */
    @PreAuthorize("@ss.hasPermi('system:accept:add')")
    @PreAuthorize("@ss.hasPermi('houseManage:check:add')")
    @Log(title = "验收记录信息-新增验收记录", businessType = BusinessType.INSERT)
    @ApiOperation(value = "添加验收记录")
    @PostMapping(value = "/add")
@@ -101,8 +107,21 @@
        dto.setCode(replace.substring(2)+String.format("%03d", size+1));
        // 添加验收记录
        checkAcceptRecordService.save(dto);

        // TODO 生成结算帐单
        if (dto.getCheckMoney()!=null&&(dto.getCheckMoney().compareTo(new BigDecimal("0"))!=0)){
            TContract contract = contractService.getById(dto.getContractId());
            // TODO 生成结算帐单
            TBill tBill = new TBill();
            tBill.setContractId(dto.getContractId());
            tBill.setContractNumber(contract.getContractNumber());
            tBill.setPayableFeesMoney(dto.getCheckMoney());
            tBill.setOutstandingMoney(dto.getCheckMoney());
            tBill.setPayableFeesTime(LocalDate.now());
            tBill.setPayFeesStatus("1");
            tBill.setBillType("4");
            tBill.setSmsStatus(0);
            tBill.setBusinessDeptId(contract.getBusinessDeptId());
            billService.save(tBill);
        }

        return R.ok();
    }
@@ -110,7 +129,7 @@
    /**
     * 查看验收记录详情
     */
    @PreAuthorize("@ss.hasPermi('system:accept:detail')")
    @PreAuthorize("@ss.hasPermi('houseManage:check:detail')")
    @ApiOperation(value = "查看验收记录详情")
    @GetMapping(value = "/getDetailById")
    public R<TCheckAcceptRecordVO> getDetailById(@RequestParam String id) {
@@ -127,7 +146,7 @@
    /**
     * 删除验收记录
     */
    @PreAuthorize("@ss.hasPermi('system:accept:delete')")
    @PreAuthorize("@ss.hasPermi('houseManage:check:delete')")
    @Log(title = "验收记录信息-删除验收记录", businessType = BusinessType.DELETE)
    @ApiOperation(value = "删除验收记录")
    @DeleteMapping(value = "/deleteById")
@@ -138,7 +157,7 @@
    /**
     * 批量删除验收记录
     */
    @PreAuthorize("@ss.hasPermi('system:accept:delete')")
    @PreAuthorize("@ss.hasPermi('houseManage:check:delete')")
    @Log(title = "验收记录信息-删除验收记录", businessType = BusinessType.DELETE)
    @ApiOperation(value = "批量删除验收记录")
    @DeleteMapping(value = "/deleteByIds")