From ecca9ab70a9a87bcb60977c92fbf81053b8fc1bb Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 04 九月 2024 09:17:55 +0800
Subject: [PATCH] 新增优化
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RecoveryServeController.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RecoveryServeController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RecoveryServeController.java
index 6a120af..aacae71 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RecoveryServeController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RecoveryServeController.java
@@ -106,7 +106,7 @@
*
* @param id 回收服务id
*/
- @RequiresPermissions("serve_recycling_list")
+ @RequiresPermissions("serve_detail")
@ApiOperation(value = "回收服务详情", tags = {"后台-回收管理-回收服务管理"})
@GetMapping(value = "/detail")
@ApiImplicitParams({
@@ -125,7 +125,7 @@
*
* @param recoveryServeRequest 回收服务信息
*/
- @RequiresPermissions("serve_recycling_list")
+ @RequiresPermissions("serve_save")
@ApiOperation(value = "新增回收服务", tags = {"后台-回收管理-回收服务管理"})
@PostMapping(value = "/save")
public R<String> save(@RequestBody RecoveryServeRequest recoveryServeRequest) {
@@ -141,6 +141,7 @@
price.setRecoveryServeId(serve.getId());
price.setRecoveryPrice(recoveryPrice);
price.setCity(city);
+ price.setCityCode(data.getCityCode());
save = save && recoveryServePriceService.save(price);
}
}
@@ -152,7 +153,7 @@
*
* @param recoveryServeRequest 回收服务信息
*/
- @RequiresPermissions("serve_recycling_list")
+ @RequiresPermissions("serve_update")
@ApiOperation(value = "修改回收服务", tags = {"后台-回收管理-回收服务管理"})
@PostMapping(value = "/update")
public R<String> update(@RequestBody RecoveryServeRequest recoveryServeRequest) {
@@ -179,6 +180,7 @@
price.setRecoveryServeId(serve.getId());
price.setRecoveryPrice(recoveryPrice);
price.setCity(city);
+ price.setCityCode(data.getCityCode());
update = update && recoveryServePriceService.save(price);
}
}
@@ -190,7 +192,7 @@
*
* @param ids 回收服务多条id拼接
*/
- @RequiresPermissions("serve_recycling_list")
+ @RequiresPermissions("serve_delete")
@ApiOperation(value = "批量删除回收服务", tags = {"后台-回收管理-回收服务管理"})
@GetMapping(value = "/batchDelete")
@ApiImplicitParams({
@@ -200,6 +202,9 @@
List<String> idList = Arrays.stream(ids.split(",")).collect(Collectors.toList());
List<RecoveryServe> list = recoveryServeService.lambdaQuery().in(RecoveryServe::getId, idList).list();
list.forEach(data -> data.setIsDelete(1));
+ recoveryServePriceService.lambdaUpdate()
+ .set(RecoveryServePrice::getIsDelete, Constants.ONE)
+ .in(RecoveryServePrice::getRecoveryServeId, idList).update();
return recoveryServeService.updateBatchById(list) ? R.ok() : R.fail();
}
--
Gitblit v1.7.1