From b9c032d96e236d9c45ca748be63a327755b82a06 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 20 二月 2025 13:43:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java
index 1cbc2f2..9b43b29 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java
+++ b/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();
+ }
+
+
+
}
--
Gitblit v1.7.1