From ec1d61de19f0fe6c3efc781e5d7a6af2ed65ae5d Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 10 六月 2025 10:51:49 +0800
Subject: [PATCH] DNC 文档导入、回传文档、解析文档、取消原有设备
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutStoreDetailServiceImpl.java | 12 ++++++++++--
1 files changed, 10 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..7a7015c 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
@@ -28,9 +28,17 @@
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);
}
}
--
Gitblit v1.9.3