From 0329de5a2343a179be54a9c70844515db202a998 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 19 一月 2026 09:42:52 +0800
Subject: [PATCH] 细节调整1
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SuperInventoryReportService.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SuperInventoryReportService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SuperInventoryReportService.java
index d8837f3..965a7c6 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SuperInventoryReportService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SuperInventoryReportService.java
@@ -250,6 +250,11 @@
result.add(data);
}
+ if(result.isEmpty()){
+ //娌℃湁鏁版嵁鏃跺皢columsMap涓殑鏁版嵁娣诲姞鍒皉esult涓綔涓洪粯璁ゆ暟鎹�
+ result.addAll(columsMap.values());
+ }
+
return result;
}
@@ -262,7 +267,8 @@
if (StringUtils.isNotBlank(param.getDeptId())) {
depotStoreQueryWrapper.likeRight("dept_id", param.getDeptId());
}
- depotStoreQueryWrapper.between("create_time", param.getStart(), param.getEnd());
+ depotStoreQueryWrapper.ge("create_time", param.getStart());
+ depotStoreQueryWrapper.le("create_time", param.getEnd());
depotStoreQueryWrapper.orderByAsc("create_time");
return depotStoreMapper.selectList(depotStoreQueryWrapper);
}
@@ -276,7 +282,8 @@
if (StringUtils.isNotBlank(param.getDeptId())) {
inoutRecordQueryWrapper.likeRight("dept_id", param.getDeptId());
}
- inoutRecordQueryWrapper.between("create_time", param.getStart(), param.getEnd());
+ inoutRecordQueryWrapper.ge("create_time", param.getStart());
+ inoutRecordQueryWrapper.le("create_time", param.getEnd());
inoutRecordQueryWrapper.orderByAsc("create_time");
return inoutRecordMapper.selectList(inoutRecordQueryWrapper);
}
@@ -290,7 +297,8 @@
if (StringUtils.isNotBlank(param.getDeptId())) {
inoutStockChangeQueryWrapper.likeRight("dept_id", param.getDeptId());
}
- inoutStockChangeQueryWrapper.between("create_time", param.getStart(), param.getEnd());
+ inoutStockChangeQueryWrapper.ge("create_time", param.getStart());
+ inoutStockChangeQueryWrapper.le("create_time", param.getEnd());
inoutStockChangeQueryWrapper.orderByAsc("create_time");
return inoutStockChangeMapper.selectList(inoutStockChangeQueryWrapper);
}
@@ -304,7 +312,8 @@
if (StringUtils.isNotBlank(param.getDeptId())) {
inoutLossOverQueryWrapper.likeRight("dept_id", param.getDeptId());
}
- inoutLossOverQueryWrapper.between("create_time", param.getStart(), param.getEnd());
+ inoutLossOverQueryWrapper.ge("create_time", param.getStart());
+ inoutLossOverQueryWrapper.le("create_time", param.getEnd());
inoutLossOverQueryWrapper.orderByAsc("create_time");
return inoutLossOverMapper.selectList(inoutLossOverQueryWrapper);
}
--
Gitblit v1.9.3