From d6dc4fa6ee7cf3aa860bd4e06312f230db168da7 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 10 四月 2025 10:42:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java
index 7d4f340..94b49ef 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java
@@ -528,6 +528,13 @@
}else {
queryWrapper.eq(StrUtil.isNotEmpty(docQuery.getDocStatus()),"u.doc_status",docQuery.getDocStatus());
}
+ if (docQuery.getDocDispatchStatus() != null && docQuery.getDocDispatchStatus().contains(",")) {
+ String[] docDispatchStatusArray = docQuery.getDocDispatchStatus().split(",");
+ List<Integer> docDispatchStatusList = Arrays.stream(docDispatchStatusArray).map(Integer::parseInt).collect(Collectors.toList());
+ queryWrapper.in("u.doc_dispatch_status",docDispatchStatusList);
+ }else {
+ queryWrapper.eq(StrUtil.isNotEmpty(docQuery.getDocDispatchStatus()),"u.doc_dispatch_status",docQuery.getDocDispatchStatus());
+ }
if (StrUtil.isNotEmpty(docQuery.getPullStatus())){
if (("1").equals(docQuery.getPullStatus())){
queryWrapper.isNull("o.doc_id");
@@ -754,6 +761,13 @@
}else {
queryWrapper.eq(StrUtil.isNotEmpty(docQuery.getDocStatus()),"u.doc_status",docQuery.getDocStatus());
}
+ if (docQuery.getDocDispatchStatus() != null && docQuery.getDocDispatchStatus().contains(",")) {
+ String[] docDispatchStatusArray = docQuery.getDocDispatchStatus().split(",");
+ List<Integer> docDispatchStatusList = Arrays.stream(docDispatchStatusArray).map(Integer::parseInt).collect(Collectors.toList());
+ queryWrapper.in("u.doc_dispatch_status",docDispatchStatusList);
+ }else {
+ queryWrapper.eq(StrUtil.isNotEmpty(docQuery.getDocDispatchStatus()),"u.doc_dispatch_status",docQuery.getDocDispatchStatus());
+ }
if (StrUtil.isNotEmpty(docQuery.getPullStatus())){
if (("1").equals(docQuery.getPullStatus())){
queryWrapper.isNull("o.doc_id");
--
Gitblit v1.9.3