From 4788f8d86807296a3dce75b5dd428c0a8d5828db Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期五, 25 七月 2025 17:12:39 +0800
Subject: [PATCH] 分类字典设置上级是否存在子节点修改
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutStoreDetailServiceImpl.java | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutStoreDetailServiceImpl.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutStoreDetailServiceImpl.java
index 8087404..8555fea 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutStoreDetailServiceImpl.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutStoreDetailServiceImpl.java
@@ -2,8 +2,11 @@
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.OutStoreDetail;
import org.jeecg.modules.tms.entity.vo.OutStoreDetailVo;
import org.jeecg.modules.tms.mapper.OutStoreDetailMapper;
@@ -12,6 +15,8 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
/**
@@ -28,9 +33,45 @@
QueryWrapper<OutStoreDetailVo> queryWrapper = Wrappers.query();
String[] classifyIds = parameterMap.get("classifyId");
if (classifyIds != null && classifyIds.length > 0) {
- queryWrapper.eq("t11.classify_id", classifyIds[0]);
+ queryWrapper.eq("t2.classify_id", classifyIds[0]);
}
- queryWrapper.orderByDesc("create_time");
+ String[] toolCodes = parameterMap.get("toolCode");
+ if (toolCodes != null && toolCodes.length > 0) {
+ queryWrapper.like("t2.tool_code", toolCodes[0]);
+ }
+ String[] toolModels = parameterMap.get("toolModel");
+ if (toolModels != null && toolModels.length > 0) {
+ queryWrapper.like("t2.tool_model", toolModels[0]);
+ }
+ queryWrapper.orderByDesc("t1.create_time");
return this.baseMapper.queryPageList(page, queryWrapper);
}
+
+ @Override
+ public IPage<Map<String, Object>> outStoreDetailList(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().outStoreDetailList(pageData,queryWrapper);
+ }
}
--
Gitblit v1.9.3