From 1cd2e610fdbd581f609e002e738b0e5cea97ad40 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 13 二月 2026 14:27:10 +0800
Subject: [PATCH] 报表问题修改
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInoutPR.java | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInoutPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInoutPR.java
index 9f8b018..b287bea 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInoutPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInoutPR.java
@@ -15,11 +15,13 @@
import com.ruoyi.common.utils.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.stereotype.Component;
+
import javax.annotation.Resource;
+import java.text.DecimalFormat;
import java.util.*;
/**
- * @Description 鍑哄叆搴撶浉鍏虫姤琛�
+ * @Description 鍑哄叆搴撶浉鍏虫姤琛�
* @Author CZT
* @Date 2025/12/29 10:32
*/
@@ -51,20 +53,20 @@
result.put("deptId", deptId);
//鑾峰彇鍒嗗簱缂栫爜瀵瑰簲鐨勫垎搴撳悕绉�
- String deptName = "";
- SysDept subDept = sysDeptService.getCacheDept(null, ContextUtil.subDeptId(null));
- if (null != subDept) {
- deptName = subDept.getDeptName();
- }
+// String deptName = "";
+// SysDept subDept = sysDeptService.getCacheDept(null, ContextUtil.subDeptId(null));
+// if (null != subDept) {
+// deptName = subDept.getDeptName();
+// }
String title = "姹囨�昏〃";
if ("IN".equals(type)) {
- title= deptName + "鍏ュ簱鏄庣粏姹囨��";
+ title = "鍏ュ簱鏄庣粏姹囨��";
}
if ("OUT".equals(type)) {
- title= deptName + "鍑哄簱鏄庣粏姹囨��";
+ title = "鍑哄簱鏄庣粏姹囨��";
}
if ("STORE".equals(type)) {
- title= deptName + "搴撳瓨姹囨�昏〃";
+ title = "搴撳瓨姹囨�昏〃";
}
result.put("end", new Date());
@@ -78,7 +80,6 @@
result.put("createTime", new Date());
result.put("title", title);
result.put("type", type);
-
return result;
}
@@ -98,12 +99,12 @@
result.put("deptId", deptId);
//鑾峰彇鍒嗗簱缂栫爜瀵瑰簲鐨勫垎搴撳悕绉�
- String deptName = "";
- SysDept subDept = sysDeptService.getCacheDept(null, ContextUtil.subDeptId(null));
- if (null != subDept) {
- deptName = subDept.getDeptName();
- }
- String title = deptName + "搴撳瓨姹囨�昏〃";
+// String deptName = "";
+// SysDept subDept = sysDeptService.getCacheDept(null, ContextUtil.subDeptId(null));
+// if (null != subDept) {
+// deptName = subDept.getDeptName();
+// }
+ String title = "搴撳瓨姹囨�昏〃";
result.put("end", new Date());
Date start = DateUtil.getNewByDay(new Date(), -30);
@@ -115,7 +116,6 @@
result.put("createUser", ContextUtil.getLoginUserName());
result.put("createTime", new Date());
result.put("title", title);
-
return result;
}
@@ -139,13 +139,13 @@
//澶氬弬鏁板垎椤垫煡璇�
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())){
+ if (StringUtils.isNotEmpty(param.getDeptId()) && StringUtils.isNotEmpty(param.getCompanyId())) {
String substring = param.getDeptId().substring(0, (param.getDeptId().length() - 3));
- if (!substring.equals(param.getCompanyId())){
+ if (!substring.equals(param.getCompanyId())) {
return new ArrayList<InoutRecord>();
}
}
- if(StringUtils.isEmpty(param.getDeptId())){
+ if (StringUtils.isEmpty(param.getDeptId())) {
param.setDeptId(param.getCompanyId());
}
@@ -162,8 +162,8 @@
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)));
+ if (StringUtils.isNotBlank(record.getDeptId())) {
+ record.setCompanyId(record.getDeptId().substring(0, (record.getDeptId().length() - 3)));
}
list.add(record);
record.setRemarks(String.valueOf(index));
--
Gitblit v1.9.3