From 5790d7573a83278667878e0f73104f8fc8ec5cf3 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期二, 10 三月 2026 11:03:51 +0800
Subject: [PATCH] 巡检统计信息纠正
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SuperInventoryReportService.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 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..a44bdfa 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
@@ -76,7 +76,6 @@
if (StringUtils.isEmpty(param.getDeptId())) {
param.setDeptId(param.getCustomerId());
}
- //test鎻愪氦
//鏀跺偍鍏徃锛屾墍灞炲簱鍖烘煡璇㈠潎涓虹┖锛屽垯鏌ヨ榛樿搴撳尯
if (StringUtils.isEmpty(param.getCustomerId()) && StringUtils.isEmpty(param.getDeptId())) {
param.setDeptId(deptId);
@@ -250,6 +249,16 @@
result.add(data);
}
+ if(result.isEmpty()){
+ //娌℃湁鏁版嵁鏃跺皢columsMap涓殑鏁版嵁娣诲姞鍒皉esult涓綔涓洪粯璁ゆ暟鎹�
+ columsMap.values().forEach(data -> {
+ String deptId_Item = data.getDeptId();
+ if(StringUtils.isNotBlank(param.getDeptId()) && deptId_Item.startsWith(param.getDeptId())){
+ result.add(data);
+ }
+ });
+ }
+
return result;
}
@@ -262,7 +271,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 +286,10 @@
if (StringUtils.isNotBlank(param.getDeptId())) {
inoutRecordQueryWrapper.likeRight("dept_id", param.getDeptId());
}
- inoutRecordQueryWrapper.between("create_time", param.getStart(), param.getEnd());
+ inoutRecordQueryWrapper.likeRight("progress", Constant.PROGRESS_RECORD); //宸插畬鎴愮殑鍗曟嵁
+ inoutRecordQueryWrapper.ne("record_status", Constant.RECORD_STATUS_DEL); //涓嶆槸鍒犻櫎鐨勫崟瀛愶紝鍗虫甯哥殑鍗曞瓙
+ inoutRecordQueryWrapper.ge("create_time", param.getStart());
+ inoutRecordQueryWrapper.le("create_time", param.getEnd());
inoutRecordQueryWrapper.orderByAsc("create_time");
return inoutRecordMapper.selectList(inoutRecordQueryWrapper);
}
@@ -290,7 +303,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 +318,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