Merge remote-tracking branch 'origin/master'

xuhy

2025-02-20 b9c032d96e236d9c45ca748be63a327755b82a06

 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java

@@ -181,6 +181,9 @@
                List<TBill> billList = bills.stream().filter(e -> e.getContractId().equals(contract.getId())).collect(Collectors.toList());
                List<PayListVO> payList = new ArrayList<>();
                for (TBill tBill : billList) {
                    if (tBill.getPayFeesTime()==null){
                        continue;
                    }
                    PayListVO payListVO = new PayListVO();
                    payListVO.setPayFeesTime(DateUtils.localDateTimeToStringYear(tBill.getPayFeesTime()));
                    payListVO.setPayFeesMoney("-" + tBill.getPayFeesMoney() + "元");
@@ -331,6 +334,26 @@
        res.setHouse(tHouse);
        return R.ok(res);
    }
    @ApiOperation(value = "管理员-我的审批分页列表")
    @PostMapping("/listExamine")
    public R examineList(@RequestBody TExamineAppletQuery dto){

        return R.ok();
    }
    @ApiOperation(value = "管理员-我的审批-撤销")
    @GetMapping("/cancel")
    public R cancel(@RequestParam String id){
        return R.ok();
    }
    @ApiOperation(value = "管理员-我的审批-审批")
    @GetMapping("/examine")
    public R examine(@RequestParam String id){

        return R.ok();
    }



}