From fc8c86e7a365d5c6bdc37c2b05b9f83115ac2bc3 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 23 四月 2025 17:30:52 +0800
Subject: [PATCH] 巡检任务 设备维修新增是否生成工单
---
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandTotalController.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandTotalController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandTotalController.java
index 914cdb9..bd5ecd0 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandTotalController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandTotalController.java
@@ -64,7 +64,6 @@
*/
@Operation(summary = "閫氳繃id鏌ヨ" , description = "閫氳繃id鏌ヨ" )
@GetMapping("/{id}" )
- @PreAuthorize("@pms.hasPermission('platformx_deviceDemandTotal_view')" )
public R getById(@PathVariable("id" ) Long id) {
DeviceDemandTotal demandTotal = deviceDemandTotalService.getById(id);
QueryWrapper<DeviceDemandSub> wrapper = new QueryWrapper<>();
@@ -86,7 +85,15 @@
QueryWrapper<DeviceDemandTotal> wrapper = new QueryWrapper<>();
wrapper.lambda()
.eq(DeviceDemandTotal::getPlanId,id);
- return R.ok(deviceDemandTotalService.list(wrapper));
+ List<DeviceDemandTotal> list = deviceDemandTotalService.list(wrapper);
+ for (DeviceDemandTotal deviceDemandTotal : list) {
+ QueryWrapper<DeviceDemandSub> wrapper1 = new QueryWrapper<>();
+ wrapper1.lambda()
+ .eq(DeviceDemandSub::getTotalId,deviceDemandTotal.getId());
+ List<DeviceDemandSub> list1 = deviceDemandSubService.list(wrapper1);
+ deviceDemandTotal.setSubList(list1);
+ }
+ return R.ok(list);
}
@@ -119,7 +126,6 @@
@Operation(summary = "淇敼璁惧闇�姹傝鍒掗」鐩瓙琛�" , description = "淇敼璁惧闇�姹傝鍒掗」鐩瓙琛�" )
@SysLog("淇敼璁惧闇�姹傝鍒掗」鐩瓙琛�" )
@PutMapping
- @PreAuthorize("@pms.hasPermission('platformx_deviceDemandTotal_edit')" )
public R updateById(@RequestBody DeviceDemandTotal deviceDemandTotal) {
List<DeviceDemandSub> subList = deviceDemandTotal.getSubList();
QueryWrapper<DeviceDemandSub> wrapper = new QueryWrapper<>();
--
Gitblit v1.9.1