From 35d9446131124e12616c7b6b9dfd79e23d20e1c9 Mon Sep 17 00:00:00 2001 From: cuijian <cuijian@xalxzn.com> Date: 星期五, 06 六月 2025 17:23:11 +0800 Subject: [PATCH] 工具台账功能 --- lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolsSharpeningServiceImpl.java | 69 ++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 1 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 3831e2d..0290d51 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 @@ -1,10 +1,23 @@ 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.metadata.OrderItem; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.commons.lang.StringUtils; +import org.jeecg.common.exception.ExceptionCast; import org.jeecg.modules.tms.entity.ToolSharpening; +import org.jeecg.modules.tms.entity.ToolsLossBoundDetail; +import org.jeecg.modules.tms.entity.vo.ToolSharpeningVo; import org.jeecg.modules.tms.mapper.ToolsSharpeningMapper; import org.jeecg.modules.tms.service.IToolsSharpeningService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; /** * @Description: 鍒�鍏峰垉纾ㄨ褰� Service 瀹炵幇绫� @@ -13,5 +26,59 @@ */ @Service public class ToolsSharpeningServiceImpl extends ServiceImpl<ToolsSharpeningMapper, ToolSharpening> implements IToolsSharpeningService { - // 濡傞渶鎵╁睍閫昏緫鍙湪姝ゆ坊鍔� + @Override + public IPage<ToolSharpeningVo> queryPageList(Page<ToolSharpeningVo> page, Map<String, String[]> parameterMap) { + QueryWrapper<ToolSharpeningVo> queryWrapper = Wrappers.query(); + String[] ids = parameterMap.get("id"); + if (ids != null && ids.length > 0) { + queryWrapper.like("t.id", ids[0]); + } + String[] toolIds = parameterMap.get("toolId"); + if (toolIds != null && toolIds.length > 0) { + queryWrapper.like("t.tool_id", toolIds[0]); + } + String[] sharpeningResults = parameterMap.get("sharpeningResult"); + if (sharpeningResults != null && sharpeningResults.length > 0) { + queryWrapper.like("t.sharpening_result", sharpeningResults[0]); + } + 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.sharpening_time", endTimes[0]); + } + queryWrapper.orderByDesc("t.create_time"); + return this.baseMapper.queryPageList(page, queryWrapper); + } + + @Override + public IPage<Map<String, Object>> toolSharpeningList(Integer pageNo, Integer pageSize, Map<String, String> query) { + if (pageNo == null || pageNo < 1 || pageSize == null || pageSize < 1) { + ExceptionCast.cast("鍙傛暟閿欒"); + } + IPage<Map> pageData = new Page<Map>(pageNo, pageSize); + QueryWrapper<Map> queryWrapper = Wrappers.query(); + if (null != query) { + String classifyId = query.get("classifyId"); + if (StringUtils.isNotBlank(classifyId)) { + queryWrapper.eq("t2.classify_id", classifyId); + } + String toolCode = query.get("toolCode"); + if (StringUtils.isNotBlank(toolCode)) { + queryWrapper.like("t2.tool_code", toolCode); + } + String toolModel = query.get("toolModel"); + if (StringUtils.isNotBlank(toolModel)) { + queryWrapper.like("t2.tool_mode", toolModel); + } + // 鎺掑簭鍐欐硶 + List<OrderItem> orderItems = new ArrayList<>(); + orderItems.add(OrderItem.desc("t1.create_time")); + ((Page<Map>) pageData).setOrders(orderItems); + } + return super.getBaseMapper().toolSharpeningList(pageData,queryWrapper); + } + } -- Gitblit v1.9.3