From 6654068961774e4c491fc46d2ee6cea636d2527a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 20 二月 2025 17:17:02 +0800
Subject: [PATCH] 审批流
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 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..134e0ab 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() + "元");
@@ -246,7 +249,7 @@
}
@ApiOperation(value = "管理员-新增验收")
- @GetMapping(value = "/addRecord")
+ @PostMapping(value = "/addRecord")
public R<TCheckAcceptRecordVO> addRecord(@Validated @RequestBody TCheckAcceptRecord dto) {
dto.setAcceptanceTime(LocalDateTime.now());
dto.setCheckTime(LocalDateTime.now());
@@ -256,14 +259,14 @@
.likeRight(TCheckAcceptRecord::getAcceptanceTime, LocalDate.now())).size();
dto.setCode(replace.substring(2)+String.format("%03d", size+1));
// 添加验收记录
- checkAcceptRecordService.save(dto);
+ checkAcceptRecordService.updateById(dto);
return R.ok();
}
/**
* 获取报修管理列表
*/
@ApiOperation(value = "管理员-房屋维修分页列表")
- @PostMapping(value = "/pageList")
+ @PostMapping(value = "/houstPageList")
public R<PageInfo<TFaultRepairMessageVO>> pageList(@RequestBody TFaultRepairMessageAppletQuery query) {
return R.ok(tFaultRepairMessageService.pageListApplet(query));
}
@@ -331,6 +334,25 @@
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