From 64efbeaafab17e2eb941b68559d43ddb37177a10 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 16 十二月 2024 15:38:48 +0800
Subject: [PATCH] 补充接口返回数据
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java
index 0325543..d155b60 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java
@@ -36,6 +36,7 @@
private GlassInfoService glassInfoService;
@Autowired
private OptimizeProjectService optimizeProjectService;
+
@ApiOperation("寮�濮�/鏆傚仠浠诲姟/浼犻�掑伐绋嬪彿鍜岀姸鎬�,寮�濮嬫槸1 鏆傚仠鏄�0")
@PostMapping("/pauseTask") //鏆傚仠涓婄墖浠诲姟
@ResponseBody
@@ -100,7 +101,7 @@
@ApiOperation("鍒犻櫎宸ョ▼涓婄墖")
@PostMapping("/deleteTask") //璋冪敤涓婄墖浠诲姟
@ResponseBody
- public Result <Boolean> deleteTask(@RequestBody Engineering engineering) {
+ public Result <List<GlassInfo>> deleteTask(@RequestBody Engineering engineering) {
//鍒犻櫎宸ョ▼琛ㄣ�佸皬鐗囪〃銆佷笂鐗囪〃锛屾洿鏀逛紭鍖栬〃鐘舵��
// boolean work=engineeringService.deleteTask(engineering.getEngineerId());
// glassInfoService.deleteTask(engineering.getEngineerId());
@@ -108,7 +109,7 @@
// optimizeProjectService.changeTask(engineering.getEngineerId(), 100);
//鏌ヨ鏈笂鐗囩殑灏忕墖淇℃伅
List<GlassInfo>glasslist=glassInfoService.selectEdgGlassInfo(engineering.getEngineerId());
- return Result.build(200, "鍒犻櫎鎴愬姛"+engineering.getEngineerId(), true);
+ return Result.build(200, "鍒犻櫎鎴愬姛"+engineering, glasslist);
}
--
Gitblit v1.8.0