From 23ba8d87f56be44209687ee03c8bda3e351412d1 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期三, 25 二月 2026 16:26:59 +0800
Subject: [PATCH] 添加地磅抓拍记录页面
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SuperInventoryReportService.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 965a7c6..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);
@@ -252,7 +251,12 @@
if(result.isEmpty()){
//娌℃湁鏁版嵁鏃跺皢columsMap涓殑鏁版嵁娣诲姞鍒皉esult涓綔涓洪粯璁ゆ暟鎹�
- result.addAll(columsMap.values());
+ columsMap.values().forEach(data -> {
+ String deptId_Item = data.getDeptId();
+ if(StringUtils.isNotBlank(param.getDeptId()) && deptId_Item.startsWith(param.getDeptId())){
+ result.add(data);
+ }
+ });
}
return result;
@@ -282,6 +286,8 @@
if (StringUtils.isNotBlank(param.getDeptId())) {
inoutRecordQueryWrapper.likeRight("dept_id", param.getDeptId());
}
+ 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");
--
Gitblit v1.9.3