From 0aacd330fca570ab3350aef5bda901f23aee23b3 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 20 十一月 2024 13:51:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java
index d3c02f3..2240fc8 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java
@@ -95,11 +95,16 @@
     }
 
     @Override
-    public  Engineering selectInitiate(Integer state) {
+    public Engineering selectInitiate(Integer state) {
         //鏌ヨ鏄惁鏈夊紑濮嬩笂鐗囩殑宸ョ▼浠诲姟
         QueryWrapper<Engineering> wrapper = new QueryWrapper<>();
-            wrapper.eq("state", state);
-        return this.getOne(wrapper);
+        wrapper.eq("state", state);
+        return engineeringMapper.selectOne(wrapper);
+    }
+
+    @Override
+    public Engineering selectUpInitiate(Integer state, Integer equipmentId) {
+        return null;
     }
 
     @Override
@@ -114,9 +119,14 @@
     public boolean pauseTask(String engineerId, Integer state) {
         //鏆傚仠姝e湪杩涜宸ョ▼
         LambdaUpdateChainWrapper<Engineering> pauseWrapper = new LambdaUpdateChainWrapper<>(this.getBaseMapper());
-        pauseWrapper.set(Engineering::getState,0);
-        pauseWrapper.eq(Engineering::getState,1);
-        return  pauseWrapper.update();
+        pauseWrapper.set(Engineering::getState, 0);
+        pauseWrapper.eq(Engineering::getState, 1);
+        return pauseWrapper.update();
+    }
+
+    @Override
+    public boolean changeTask(String engineerId, Integer state, Integer filmRemove, Integer stationCell) {
+        return false;
     }
 
 }

--
Gitblit v1.8.0