From 69cd9f59a0fabf12f8c9147fcba7f69817a870b3 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 06 十一月 2023 23:40:59 +0800
Subject: [PATCH] 更新仓内抓拍2
---
igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 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 9bf2c66..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
@@ -9,7 +9,6 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
-
import java.util.ArrayList;
import java.util.List;
@@ -39,19 +38,28 @@
@Override
public List<CheckItemData> getCheckItemById(String checkId, String companyId) {
- return checkStandardMapper.getCheckItemById(checkId, companyId);
+ List<CheckItemData> result = checkStandardMapper.getCheckItemById(checkId, companyId);
+ for (CheckItemData data : result) {
+ if (data.getUpperLimit() > 0.0 && StringUtils.isNotEmpty(data.getOperaSymbol())) {
+ data.setOperaSymbolValue(data.getOperaSymbol() + " " + data.getUpperLimit());
+ }
+ }
+ return result;
}
@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;
@@ -60,12 +68,10 @@
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())) {
- item.setOperaSymbol(data.getOperaSymbol() + " " + data.getUpperLimit());
+ 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