From 43ce77a85d8297a53dc25430fff10ead57296167 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期六, 04 十一月 2023 15:43:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-inout/src/main/java/com/ld/igds/inout/service/HInoutReportService.java | 10 ++--------
1 files changed, 2 insertions(+), 8 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 85d500c..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
@@ -19,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) {
@@ -39,14 +39,8 @@
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("noticeId");
--
Gitblit v1.9.3