From e990e67920907f103ab7ec3a5a2f86d33f8e6bd2 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期四, 22 五月 2025 10:28:50 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolLedgerDetailServiceImpl.java | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolLedgerDetailServiceImpl.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolLedgerDetailServiceImpl.java index 90b2856..284b226 100644 --- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolLedgerDetailServiceImpl.java +++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolLedgerDetailServiceImpl.java @@ -1,11 +1,15 @@ package org.jeecg.modules.tms.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.modules.tms.entity.ToolLedgerDetail; import org.jeecg.modules.tms.mapper.ToolLedgerDetailMapper; import org.jeecg.modules.tms.service.IToolLedgerDetailService; import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.Map; /** * @Description: tms_tool_ledger_detail @@ -16,4 +20,22 @@ @Service public class ToolLedgerDetailServiceImpl extends ServiceImpl<ToolLedgerDetailMapper, ToolLedgerDetail> implements IToolLedgerDetailService { + @Override + public IPage<ToolLedgerDetail> queryPageList(Page<ToolLedgerDetail> page, Map<String, String[]> parameterMap) { + QueryWrapper<Object> queryWrapper = Wrappers.query(); + String[] toolCodes = parameterMap.get("toolCode"); + if (toolCodes != null && toolCodes.length > 0) { + queryWrapper.like("p.tool_code", toolCodes[0]); + } + String[] statuses = parameterMap.get("status"); + if (statuses != null && statuses.length > 0) { + queryWrapper.eq("t.status", statuses[0]); + } + String[] excludeIds = parameterMap.get("excludeIds"); + if (excludeIds != null && excludeIds.length > 0) { + String[] idArray = excludeIds[0].split(","); + queryWrapper.notIn("t.id", idArray); + } + return this.baseMapper.queryPageList(page, queryWrapper); + } } -- Gitblit v1.9.3