feat: 1.修改统计跟随查询变化 2.修改账单分页查询排序，新增按状态排序权重表 3.新增修改账单金额接口

yupeng

2025-04-09 380efb1e727d51c9080a91bd7aad6a063081bb45

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

@@ -10,11 +10,10 @@
import com.ruoyi.system.model.TBill;
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.service.ISysUserService;
import com.ruoyi.system.service.TBillConfirmService;
import com.ruoyi.system.service.TBillDetailService;
import com.ruoyi.system.service.TBillService;
import com.ruoyi.system.query.TContractQuery;
import com.ruoyi.system.service.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +22,7 @@
import org.springframework.web.bind.annotation.*;

import javax.validation.constraints.NotEmpty;
import java.math.BigDecimal;
import java.util.List;

/**
@@ -47,6 +47,9 @@
    @Autowired
    TBillConfirmService tBillConfirmService;

    @Autowired
    TContractService contractService;

    @PreAuthorize("@ss.hasPermi('bill:list')")
    @PostMapping("list")
    @ApiOperation("分页查询账单列表")
@@ -56,12 +59,44 @@
        return R.ok(pageInfo);
    }

    @ApiOperation("统计")
    @PostMapping("statistics")
    public R<BillStatisticsDto> statistics(@RequestBody TBillQuery query){
        query.setBusinessDeptId(SecurityUtils.getBusinessDeptId());
        BillStatisticsDto dto = tBillService.statistics(query);
        return R.ok(dto);
    }


    @ApiOperation(value = "获取合同分页列表")
    @PostMapping(value = "/contractList")
    public R<PageInfo<TContract>> contractList(@RequestBody TContractQuery query) {
        query.setBusinessDeptId(SecurityUtils.getBusinessDeptId());
        return R.ok(contractService.queryPage(query));
    }

    @PreAuthorize("@ss.hasPermi('bill:list:addRent')")
    @PostMapping("add")
    @ApiOperation("新增账单")
    public R<PageInfo<TBillDto>> add(@Validated @RequestBody TbillSaveDto bill){
    public R add(@Validated @RequestBody TbillSaveDto bill){
        bill.setBusinessDeptId(SecurityUtils.getBusinessDeptId());
        tBillService.saveBill(bill);
        return R.ok();
    }


    @PreAuthorize("@ss.hasPermi('bill:list:editAmount')")
    @PostMapping("editAmount")
    @ApiOperation("修改账单金额")
    public R editAmount(@Validated @RequestBody TbillSaveDto bill){
        if (StringUtils.isEmpty(bill.getId())){
            return R.fail("参数错误");
        }
        if (bill.getEditAmount().compareTo(BigDecimal.ZERO)==0){
            return R.fail("调整金额不能为0");
        }

        tBillService.editAmount(bill);
        return R.ok();
    }

@@ -124,12 +159,7 @@
    }


    @ApiOperation("统计")
    @GetMapping("statistics")
    public R<BillStatisticsDto> statistics(){
        BillStatisticsDto dto = tBillService.statistics(SecurityUtils.getBusinessDeptId());
        return R.ok(dto);
    }