From ca511301d30594decf86b1a53eed3bbfc0b60ead Mon Sep 17 00:00:00 2001 From: cuilei <ray_tsu1@163.com> Date: 星期二, 03 六月 2025 17:11:01 +0800 Subject: [PATCH] 工具管理-工具出库流水查询、导出接口调整 --- lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolsSharpeningServiceImpl.java | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolsSharpeningServiceImpl.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolsSharpeningServiceImpl.java index 5a64898..f05572d 100644 --- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolsSharpeningServiceImpl.java +++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolsSharpeningServiceImpl.java @@ -32,13 +32,17 @@ if (toolIds != null && toolIds.length > 0) { queryWrapper.like("t.tool_id", toolIds[0]); } - String[] startTimes = parameterMap.get("startTime"); - if (startTimes != null && startTimes.length > 0) { - queryWrapper.ge("t.create_time", startTimes[0]); + String[] sharpeningResults = parameterMap.get("sharpeningResult"); + if (sharpeningResults != null && sharpeningResults.length > 0) { + queryWrapper.like("t.sharpening_result", sharpeningResults[0]); } - String[] endTimes = parameterMap.get("endTime"); + String[] startTimes = parameterMap.get("sharpeningTimeBegin "); + if (startTimes != null && startTimes.length > 0) { + queryWrapper.ge("t.sharpening_time", startTimes[0]); + } + String[] endTimes = parameterMap.get("sharpeningTimeEnd"); if (endTimes != null && endTimes.length > 0) { - queryWrapper.le("t.create_time", endTimes[0]); + queryWrapper.le("t.sharpening_time", endTimes[0]); } queryWrapper.orderByDesc("t.create_time"); return this.baseMapper.queryPageList(page, queryWrapper); -- Gitblit v1.9.3