From 53bf1e11c46964e15ab2d334457066ed3b68c98d Mon Sep 17 00:00:00 2001 From: baoshiwei <baoshiwei@shlanbao.cn> Date: 星期五, 06 六月 2025 12:57:57 +0800 Subject: [PATCH] refactor(lb-eims):调整代码和更新配置- 注释掉 EimsEquImportVo 中的 @ExcelProperty 注解 - 优化 EimsEquImportListener 中的异常日志输出- 更新 snailjob 监控页面的 iframe 源地址- 修改移动端项目的 API 基础 URL - 优化移动端页面跳转逻辑 - 改进维修请求列表的接单操作流程 --- eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsSpareServiceImpl.java | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsSpareServiceImpl.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsSpareServiceImpl.java index 1c8619a..dc9cd62 100644 --- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsSpareServiceImpl.java +++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsSpareServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.eims.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -8,6 +9,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.eims.domain.EimsSpareInout; +import org.dromara.eims.domain.bo.EimsSpareInoutBo; +import org.dromara.eims.domain.vo.EimsSpareInoutVo; +import org.dromara.eims.domain.vo.EimsSpareInoutdtVo; import org.springframework.stereotype.Service; import org.dromara.eims.domain.bo.EimsSpareBo; import org.dromara.eims.domain.vo.EimsSpareVo; @@ -56,6 +61,13 @@ return TableDataInfo.build(result); } + + @Override + public TableDataInfo<EimsSpareInoutdtVo> querySpareInoutList(EimsSpareBo bo, PageQuery pageQuery) { + Page<EimsSpareInoutdtVo> result = baseMapper.selectSpareInoutList(pageQuery.build(), buildWrapper(bo)); + return TableDataInfo.build(result); + } + /** * 鏌ヨ绗﹀悎鏉′欢鐨勫浠跺彴璐﹀垪琛� * @@ -78,7 +90,16 @@ lqw.like(StringUtils.isNotBlank(bo.getMadeIn()), EimsSpare::getMadeIn, bo.getMadeIn()); lqw.like(StringUtils.isNotBlank(bo.getSupplier()), EimsSpare::getSupplier, bo.getSupplier()); lqw.eq(StringUtils.isNotBlank(bo.getUnit()), EimsSpare::getUnit, bo.getUnit()); + // 鎸夊垱寤烘椂闂村�掑簭 + lqw.orderByDesc(EimsSpare::getCreateTime); return lqw; + } + + private QueryWrapper<EimsSpare> buildWrapper(EimsSpareBo bo) { + Map<String, Object> params = bo.getParams(); + QueryWrapper<EimsSpare> qw = Wrappers.query(); + qw.eq( "sp.id", bo.getId()); + return qw; } /** @@ -132,4 +153,6 @@ } return baseMapper.deleteByIds(ids) > 0; } + + } -- Gitblit v1.9.3