From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 11 十月 2024 08:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 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 e12e67f..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,9 +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;
@@ -19,17 +19,25 @@
/**
* 鏌ヨ鍙鍙栫殑浠诲姟宸ョ▼淇℃伅
- * @return
+ * @return List<OptimizeProject>
*/
List<OptimizeProject> listByState(OptimizeRequest optimizeRequest);
- /**
- * 灏嗗伐绋嬩俊鎭繚瀛樺埌鍘熺墖浣跨敤璇︽儏琛�
- * @return
- */
- void insetupPattenUsage(List<OptimizeProject> glass);
+
/**
* 灏嗗伐绋嬩俊鎭洿鏂扮姸鎬佷负宸查鍙�
- * @return
*/
void changeTask(String engineeringId, int i);
+ /**
+ * 瀹屾垚宸ョ▼浠诲姟鏀逛负300
+ *
+ * @return
+ */
+ boolean overTask(UpPattenUsage sequence, int state);
+ /**
+ * 鑾峰彇姝ｅ湪杩涜涓殑浠诲姟
+ *
+ * @return
+ */
+ List<OptimizeProject> getDoingTask();
+
}
--
Gitblit v1.8.0