From 03baf01cdaa23d7986fc65b0394c7c550334ec42 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 30 十月 2023 16:14:23 +0800
Subject: [PATCH] 优化调整扦样化验及廒间管理
---
igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java b/igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java
index aa5a242..ef48505 100644
--- a/igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java
+++ b/igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java
@@ -48,15 +48,18 @@
}
@Override
- public List<CheckItemData> getCheckItemByStandard(String checkId, String companyId, String foodVariety) {
+ public List<CheckItemData> getCheckItemByStandard(String companyId,String checkId,String foodVariety) {
List<CheckItemData> result = new ArrayList<>();
+
if (StringUtils.isEmpty(foodVariety)) {
return result;
}
+
if (StringUtils.isEmpty(companyId)) {
companyId = ContextUtil.getDefaultCompanyId();
}
+
List<CheckStandardData> list = checkStandardMapper.getCheckStandard(companyId, foodVariety);
if (null == list) {
return result;
@@ -65,11 +68,9 @@
CheckItemData item;
for (CheckStandardData data : list) {
item = new CheckItemData();
-
BeanUtils.copyProperties(data, item);
item.setCheckId(checkId);
-
- if (data.getUpperLimit() > 0.0 && StringUtils.isNotEmpty(data.getOperaSymbol())) {
+ if (null != data.getUpperLimit() && data.getUpperLimit() > 0.0 && StringUtils.isNotEmpty(data.getOperaSymbol())) {
item.setOperaSymbolValue(data.getOperaSymbol() + " " + data.getUpperLimit());
}
result.add(item);
--
Gitblit v1.9.3