From 110ff41b225e47b736fea112c83955a107ead905 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 15 十月 2024 17:07:44 +0800
Subject: [PATCH] 代码合并--新增英文翻译切换按钮
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java | 4 ++--
1 files changed, 2 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 0fd9bdc..fd02356 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
@@ -29,7 +29,7 @@
public List<TemperingGlassInfo> selectWaitingGlass() {
//鑾峰彇绛夊緟杩涚倝涓殑鐜荤拑淇℃伅
QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
- wrapper.select("Top 1 *").in("state",1,0);
+ wrapper.select("Top 1 *").in("state",1,0,-1);
TemperingGlassInfo glass=temperingMapper.selectOne(wrapper);
if(glass!=null) {
QueryWrapper<TemperingGlassInfo> glassinfo = new QueryWrapper<>();
@@ -88,7 +88,7 @@
wrapper.select("tempering_layout_id,engineer_id,max(id) as id")
.eq("state",2)
.groupBy("tempering_layout_id,engineer_id")
- .orderByDesc("id");
+ .orderByAsc("id");
return temperingMapper.selectList(wrapper);
}
--
Gitblit v1.8.0