From 5ffc5c22b0833d8f569e99eb775d08ca28676c7d Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 19 一月 2026 14:37:16 +0800
Subject: [PATCH] 细节调整2
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetailPR.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetailPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetailPR.java
index 6754a71..cbee952 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetailPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetailPR.java
@@ -48,14 +48,16 @@
result.setTitle(deptName + "鍑哄簱鏄庣粏姹囨��");
result.setDeptId(deptId);
}
- result.setUnit("鍗冨厠锛圞G锛�");
result.setEnd(new Date());
Date start = DateUtil.getNewByDay(new Date(), -30);
result.setStart(start);
result.setTimeDesc(
- DateFormatUtils.format(start, "yyyy-MM-dd") + " 鎴嚦锛�"
+ DateFormatUtils.format(start, "yyyy-MM-dd") + " 鑷� "
+ DateFormatUtils.format(new Date(), "yyyy-MM-dd"));
+
+ result.setCreateUser(ContextUtil.getLoginUserName());
+ result.setCreateTime(new Date());
return result;
}
@@ -74,8 +76,22 @@
}
//鏌ヨ鍑哄簱鏁版嵁
param.setType(Constant.TYPE_OUT);
+ param.setProgress(Constant.PROGRESS_RECORD);
+ param.setRecordStatus(Constant.RECORD_STATUS_NORMAL);
//澶氬弬鏁板垎椤垫煡璇�
com.baomidou.mybatisplus.extension.plugins.pagination.Page<InoutRecord> corePage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(0, 10000);
+ //鏀跺偍鍏徃鏌ヨ澶勭悊
+ if(StringUtils.isNotEmpty(param.getDeptId()) && StringUtils.isNotEmpty(param.getCompanyId())){
+ String substring = param.getDeptId().substring(0, (param.getDeptId().length() - 3));
+ if (!substring.equals(param.getCompanyId())){
+ return new ArrayList<InoutRecord>();
+ }
+ }
+ if(StringUtils.isEmpty(param.getDeptId())){
+ param.setDeptId(param.getCompanyId());
+ }
+
+ param.setCompanyId(null);
inoutReportService.listPageInout(corePage, param);
//鑾峰彇鏌ヨ鍒板緱list鏁版嵁
List<InoutRecord> result = corePage.getRecords();
@@ -88,6 +104,9 @@
int index = 1;
List<InoutRecord> list = new ArrayList<>();
for (InoutRecord record : result) {
+ if(StringUtils.isNotBlank(record.getDeptId())){
+ record.setCompanyId(record.getDeptId().substring(0,(record.getDeptId().length()-3)));
+ }
list.add(record);
record.setRemarks(String.valueOf(index));
emptyWeightSum += record.getEmptyWeight();
--
Gitblit v1.9.3