From c1b6a6157b8cd13192f9a9f5a819150504d08701 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 24 七月 2024 08:38:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
index 806ee21..36359f6 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
@@ -30,7 +30,7 @@
//鑾峰彇绛夊緟杩涚倝涓殑鐜荤拑淇℃伅
QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
//wrapper.eq("state",1);
- wrapper.in("state",1,0);
+ wrapper.in("state",1,0,-1);
return temperingMapper.selectList(wrapper);
}
@@ -86,4 +86,16 @@
.groupBy("state");
return temperingMapper.selectList(wrapper);
}
+
+ @Override
+ public Integer updateTemperingState(TemperingGlassInfo temperingGlassInfo) {
+ QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
+ wrapper.eq("glass_id",temperingGlassInfo.getGlassId())
+ .lt("state",5);
+ if (temperingMapper.update(temperingGlassInfo,wrapper) > 0) {
+ return 200;
+ }else {
+ return 100;
+ }
+ }
}
--
Gitblit v1.8.0