From 889ff0512bc68be0f5d231a524bf97c9488ec37f Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 16 五月 2024 16:13:20 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/controller/EngineeringController.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/controller/EngineeringController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/controller/EngineeringController.java
index f80d3c0..97571fa 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/controller/EngineeringController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/controller/EngineeringController.java
@@ -8,6 +8,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.mes.engineering.service.EngineeringService;
+
+import java.util.List;
+
/**
* <p>
* 鍓嶇鎺у埗鍣�
@@ -26,10 +29,19 @@
@ApiOperation("寮�濮�/鏆傚仠浠诲姟/浼犻�掑伐绋嬪彿鍜岀姸鎬�,寮�濮嬫槸1 鏆傚仠鏄�0")
@PostMapping("/changeTask") //璋冪敤涓婄墖浠诲姟
@ResponseBody
- public Result <Engineering> changeTask(String projectId , Integer state) {
- boolean work=engineeringService.changeTask(projectId,state);
- log.info("寮�濮嬩换鍔¤繑鍥�:{}", work);
- return Result.build(200, "",null);
+ public Result <Boolean> changeTask(@RequestBody Engineering engineering) {
+ boolean work=engineeringService.changeTask(engineering.getEngineerId(),engineering.getState());
+ log.info("StartorStop:{},{}", work,engineering);
+ return Result.build(200, engineering.getEngineerId(),work);
+ }
+
+ @ApiOperation("鏌ヨ鍙互涓婄墖鐨勫伐绋嬪彿")
+ @GetMapping("/selectTask") //璋冪敤涓婄墖浠诲姟
+ @ResponseBody
+ public Result <List<Engineering>> selectTask() {
+ List<Engineering> engineering=engineeringService.selectTask();
+ log.info("鍙鍙栦换鍔¤繑鍥�:{}", engineering);
+ return Result.build(200, "",engineering);
}
}
--
Gitblit v1.8.0