From 2fe150d7351d329fd1bae4f8ef9cbdfc9c172362 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 29 十月 2025 17:48:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineerScheduling/controller/EngineerSchedulingController.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineerScheduling/controller/EngineerSchedulingController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineerScheduling/controller/EngineerSchedulingController.java
index 5e743cd..1bca1fc 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineerScheduling/controller/EngineerSchedulingController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineerScheduling/controller/EngineerSchedulingController.java
@@ -1,9 +1,19 @@
package com.mes.engineerScheduling.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.mes.engineerScheduling.entity.EngineerScheduling;
+import com.mes.engineerScheduling.service.EngineerSchedulingService;
+import com.mes.pp.entity.OptimizeProject;
+import com.mes.pp.entity.request.OptimizeRequest;
+import com.mes.pp.service.OptimizeProjectService;
+import com.mes.utils.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
/**
* <p>
@@ -14,8 +24,21 @@
* @since 2025-10-27
*/
@RestController
-@RequestMapping("/engineerScheduling/engineer-scheduling")
+@RequestMapping("/engineerScheduling")
+@Slf4j
+@Api(tags = "鎺掍骇淇℃伅")
public class EngineerSchedulingController {
+ @Autowired
+ //鑾峰彇寰呴�夋嫨鐨勫伐绋嬪彿
+ private EngineerSchedulingService engineerSchedulingService;
+ @ApiOperation("鏄剧ず宸ョ▼閫夋嫨淇℃伅")
+ @PostMapping("/queryEngineerScheduling") //鏄剧ず宸ョ▼閫夋嫨淇℃伅
+ @ResponseBody
+ public Result<List<EngineerScheduling>> queryEngineerScheduling() {
+ //鑾峰彇寰呴�夋嫨鐨勫伐绋嬪彿
+ List<EngineerScheduling> engineerScheduling = engineerSchedulingService.listByState();
+ return Result.build(200, "", engineerScheduling);
+ }
}
--
Gitblit v1.8.0