From 636bd027a92d4bf669410ee550a5ca6324f72c88 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 27 十月 2025 17:30:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java
index 1a5f29e..731b748 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java
@@ -2,6 +2,7 @@
import com.mes.pp.entity.OptimizeProject;
+import com.mes.pp.entity.dto.ProgressDTO;
import com.mes.pp.entity.request.OptimizeRequest;
import com.mes.pp.service.OptimizeProjectService;
import com.mes.utils.Result;
@@ -41,6 +42,37 @@
return Result.build(200, "", glass);
}
+ @ApiOperation("鏌ヨ宸ョ▼淇℃伅")
+ @PostMapping("/queryEngineer") //鏄剧ず宸ョ▼淇℃伅 pp琛�
+ @ResponseBody
+ public Result<List<OptimizeProject>> queryEngineer() {
+ List<OptimizeProject> resultList = optimizeProjectService.queryEngineer();
+ return Result.build(200, "", resultList);
+ }
+
+ @ApiOperation("鏌ヨ宸ョ▼鎺掍骇淇℃伅")
+ @PostMapping("/engineerScheduling") //鏄剧ず宸ョ▼鎺掍骇淇℃伅 engineerScheduling琛�
+ @ResponseBody
+ public Result<List<OptimizeProject>> engineerScheduling(@RequestBody OptimizeProject optimizeProject) {
+ List<OptimizeProject> engineerScheduling = optimizeProjectService.engineerScheduling(optimizeProject);
+ return Result.build(200, "", engineerScheduling);
+ }
+
+ @ApiOperation("鏇存柊宸ョ▼淇℃伅")
+ @PostMapping("/updateEngineerScheduling") //鏇存柊宸ョ▼鎺掍骇淇℃伅 engineerScheduling琛�
+ @ResponseBody
+ public Result<List<OptimizeProject>> updateEngineerScheduling(@RequestParam Integer type, @RequestBody List<OptimizeProject> engineerList) {
+ List<OptimizeProject> resultList = optimizeProjectService.updateEngineerScheduling(type, engineerList);
+ return Result.build(200, "鏇存柊鎴愬姛", resultList);
+ }
+ @ApiOperation("鏌ヨ宸ョ▼杩涘害")
+ @PostMapping("/selectProgress") //鏇存柊宸ョ▼鎺掍骇淇℃伅 engineerScheduling琛�
+ @ResponseBody
+ public Result<List<ProgressDTO>> selectProgress(@RequestBody OptimizeRequest optimizeRequest) {
+ List<ProgressDTO> resultList = optimizeProjectService.selectProgress(optimizeRequest.getProjectNo());
+ return Result.build(200, "鏇存柊鎴愬姛", resultList);
+ }
+
// @ApiOperation("淇濆瓨宸ョ▼淇℃伅")
// @PostMapping("/saveProject") //鏄剧ず宸ョ▼閫夋嫨淇℃伅
// public Result<List<OptimizeProject>> saveProject(@RequestBody OptimizeRequest optimizeRequest) {
--
Gitblit v1.8.0