From 261698358e2b756a61e992bc1651e01b3f45290b Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 23 十月 2025 16:50:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java
index c76c026..852ac35 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java
@@ -4,6 +4,7 @@
import com.mes.pp.entity.OptimizeProject;
import com.mes.pp.entity.request.OptimizeRequest;
import com.mes.uppattenusage.entity.UpPattenUsage;
+import io.swagger.models.auth.In;
import java.util.List;
@@ -19,6 +20,7 @@
/**
* 鏌ヨ鍙鍙栫殑浠诲姟宸ョ▼淇℃伅
+ *
* @return List<OptimizeProject>
*/
List<OptimizeProject> listByState(OptimizeRequest optimizeRequest);
@@ -27,12 +29,14 @@
* 灏嗗伐绋嬩俊鎭洿鏂扮姸鎬佷负宸查鍙�
*/
void changeTask(String engineeringId, int i);
+
/**
* 瀹屾垚宸ョ▼浠诲姟鏀逛负300
*
* @return
*/
boolean overTask(UpPattenUsage sequence, int state);
+
/**
* 鑾峰彇姝ｅ湪杩涜涓殑浠诲姟
*
@@ -42,20 +46,29 @@
/**
* 鏌ヨ宸ョ▼淇℃伅
+ *
* @return
*/
List<OptimizeProject> queryEngineer();
/**
* 鏌ヨ宸ョ▼鎺掑簭淇℃伅
+ *
* @return
*/
List<OptimizeProject> engineerScheduling(OptimizeProject optimizeProject);
/**
* 鏇存柊宸ョ▼鎺掍骇淇℃伅
+ *
* @return
*/
- List<OptimizeProject> updateEngineerScheduling(Integer type , List<OptimizeProject> engineerList);
+ List<OptimizeProject> updateEngineerScheduling(Integer type, List<OptimizeProject> engineerList);
+ /**
+ * 鍒犻櫎宸ョ▼鎺掍骇淇℃伅
+ *
+ * @return
+ */
+ void deleteengineerSchedulingByid(String engineerId, List<Integer> types);
}
--
Gitblit v1.8.0