Merge remote-tracking branch 'origin/master'

ZengTao

2025-10-31 d55b5b015eef8c31d9dea6587dc6fd0e02818cd1

 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);
    }