From dd60bcc7b38c2a19c02a20550a393987fc5a5a27 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 07 八月 2024 16:26:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 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 c61e331..a2d8310 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
@@ -1,8 +1,9 @@
package com.mes.pp.service;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
import com.mes.pp.entity.OptimizeProject;
import com.mes.pp.entity.request.OptimizeRequest;
+import com.mes.uppattenusage.entity.UpPattenUsage;
import java.util.List;
@@ -14,21 +15,29 @@
* @author zhoush
* @since 2024-04-16
*/
-public interface OptimizeProjectService extends IService<OptimizeProject> {
+public interface OptimizeProjectService extends MPJBaseService<OptimizeProject> {
/**
* 鏌ヨ鍙鍙栫殑浠诲姟宸ョ▼淇℃伅
- * @return
+ * @return List<OptimizeProject>
*/
List<OptimizeProject> listByState(OptimizeRequest optimizeRequest);
+
/**
- * 鏌ヨ淇濆瓨鍒板師鐗囦娇鐢ㄨ鎯呰〃鐨勬暟鎹�
+ * 灏嗗伐绋嬩俊鎭洿鏂扮姸鎬佷负宸查鍙�
+ */
+ void changeTask(String engineeringId, int i);
+ /**
+ * 瀹屾垚宸ョ▼浠诲姟鏀逛负300
+ *
* @return
*/
- List<OptimizeProject> selectSaveProject(OptimizeRequest optimizeRequest);
+ boolean overTask(UpPattenUsage sequence, int state);
/**
- * 灏嗗伐绋嬩俊鎭繚瀛樺埌鍘熺墖浣跨敤璇︽儏琛�
+ * 鑾峰彇姝ｅ湪杩涜涓殑浠诲姟
+ *
* @return
*/
- void insetupPattenUsage(List<OptimizeProject> glass);
+ List<OptimizeProject> getDoingTask();
+
}
--
Gitblit v1.8.0