From d55b5b015eef8c31d9dea6587dc6fd0e02818cd1 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 31 十月 2025 08:21:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineerScheduling/service/impl/EngineerSchedulingServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineerScheduling/service/impl/EngineerSchedulingServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineerScheduling/service/impl/EngineerSchedulingServiceImpl.java
index 54f793f..b80f04b 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineerScheduling/service/impl/EngineerSchedulingServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineerScheduling/service/impl/EngineerSchedulingServiceImpl.java
@@ -25,14 +25,16 @@
@Override
public List<EngineerScheduling> listByState() {
QueryWrapper<EngineerScheduling> wrapper = new QueryWrapper<>();
- wrapper.lt("type", 3);
+ wrapper.lt("type", 3)
+ .eq("state", 100);
return baseMapper.selectList(wrapper);
}
@Override
public List<EngineerScheduling> queryByType(Integer type) {
QueryWrapper<EngineerScheduling> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("type", type);
+ queryWrapper.eq("type", type)
+ .orderByAsc("id");
return baseMapper.selectList(queryWrapper);
}
--
Gitblit v1.8.0