From e08f1e0b40dd9aeb349e86534ffe2d83ddc42552 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 30 十二月 2024 13:45:11 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/HangZhouMes
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 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 537dbdf..8117246 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
@@ -86,9 +86,10 @@
@Override
public List<TemperingGlassInfo> selectLayoutId() {
QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
- wrapper.select("distinct tempering_layout_id,engineer_id")
+ wrapper.select("tempering_layout_id,engineer_id,max(id) as id")
.eq("state",2)
- .orderByAsc("tempering_layout_id");
+ .groupBy("tempering_layout_id,engineer_id")
+ .orderByAsc("id");
return temperingMapper.selectList(wrapper);
}
@@ -108,4 +109,30 @@
return 100;
}
}
+
+ @Override
+ public List<TemperingGlassInfo> selectGlassInfoById(Integer id)
+ {
+ List<TemperingGlassInfo> result=null;
+ QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
+ wrapper.select("Top 1 *").in("state",1,0).eq("temperingLayoutId",id);
+ TemperingGlassInfo glass=temperingMapper.selectOne(wrapper);
+ if(glass!=null) {
+ QueryWrapper<TemperingGlassInfo> glassinfo = new QueryWrapper<>();
+ glassinfo.eq("engineer_id", glass.getEngineerId())
+ .eq("tempering_layout_id", id);
+ //return temperingMapper.selectList(glassinfo);
+ result= temperingMapper.selectByEngineerIdAndLayoutId(glass.getEngineerId(),glass.getTemperingLayoutId());
+ }
+ return result;
+ }
+
+ @Override
+ public boolean updateTemperingStateAll(TemperingGlassInfo glassinfo) {
+ UpdateWrapper<TemperingGlassInfo> wrapper = new UpdateWrapper<>();
+ wrapper.eq("engineer_id", glassinfo.getEngineerId())
+ .eq("tempering_layout_id", glassinfo.getTemperingLayoutId())
+ .set("state", glassinfo.getState());
+ return update(wrapper);
+ }
}
--
Gitblit v1.8.0