From c206acfaedc69c390fb67daa81bc686f58a212ef Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 27 十一月 2023 16:12:11 +0800
Subject: [PATCH] 提交配置信息2
---
igds-inout/src/main/java/com/ld/igds/inout/service/HInoutReportService.java | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/service/HInoutReportService.java b/igds-inout/src/main/java/com/ld/igds/inout/service/HInoutReportService.java
index 3083052..57eadbb 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/service/HInoutReportService.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/service/HInoutReportService.java
@@ -6,6 +6,7 @@
import com.ld.igds.util.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
+
import java.util.*;
@Component
@@ -18,7 +19,7 @@
String hql = " from " + InoutRecord.class.getName()
+ " where companyId=:companyId ";
- Map<String, Object> args = new HashMap<String, Object>();
+ Map<String, Object> args = new HashMap<>();
args.put("companyId", ContextUtil.getCompanyId());
if (null != param) {
@@ -38,20 +39,14 @@
if (StringUtils.isNotEmpty(str)) {
hql += " and type=:type ";
args.put("type", str);
- }
-
- str = (String) param.get("type");
- if (StringUtils.isEmpty(str)) {
+ }else{
hql += " and type <> 'LOSS' and type <> 'OVER'";
- } else {
- hql += " and type=:type ";
- args.put("type", str);
}
- str = (String) param.get("customerId");
+ str = (String) param.get("noticeId");
if (StringUtils.isNotEmpty(str)) {
- hql += " and customerId=:customerId ";
- args.put("customerId", str);
+ hql += " and noticeId=:noticeId ";
+ args.put("noticeId", str);
}
str = (String) param.get("progress");
--
Gitblit v1.9.3