From 419e76f6256868851ed245940297f7f5bfd99e55 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期四, 01 六月 2023 17:54:45 +0800
Subject: [PATCH] 化验页面优化1
---
igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java | 45 ++++++++++++---------------------------------
1 files changed, 12 insertions(+), 33 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 16a2de4..9bf2c66 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
@@ -6,6 +6,7 @@
import com.ld.igds.check.service.CoreCheckStandardService;
import com.ld.igds.util.ContextUtil;
import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
@@ -42,14 +43,16 @@
}
@Override
- public List<CheckItemData> getCheckItemByStandard(String checkId, String companyId,
- String deptId, String foodVariety) {
+ public List<CheckItemData> getCheckItemByStandard(String checkId, String companyId, String foodVariety) {
List<CheckItemData> result = new ArrayList<>();
if (StringUtils.isEmpty(foodVariety)) {
return result;
}
- List<CheckStandardData> list = this.getCheckStandard(companyId, deptId, foodVariety);
+ if (StringUtils.isEmpty(companyId)) {
+ companyId = ContextUtil.getDefaultCompanyId();
+ }
+ List<CheckStandardData> list = checkStandardMapper.getCheckStandard(companyId, foodVariety);
if (null == list) {
return result;
}
@@ -57,40 +60,16 @@
CheckItemData item;
for (CheckStandardData data : list) {
item = new CheckItemData();
+
+ BeanUtils.copyProperties(data, item);
item.setCheckId(checkId);
- item.setCompanyId(companyId);
- item.setStandardId(data.getStandardId());
- item.setStandardName(data.getStandardName());
- item.setUnit(data.getUnit());
- item.setUpperLimit(data.getUpperLimit());
- item.setRuleNum(data.getRuleNum());
- item.setRuleAdd(data.getRuleAdd());
- item.setRuleAddEnd(data.getRuleAddEnd());
- item.setRuleReduce(data.getRuleReduce());
- item.setOperaSymbol(data.getOperaSymbol());
-// TODO
-// if (data.getUpperLimit() > 0.0) {
-// item.setStandardValue(data.getUpperLimit() + "");
-// if(null != data.getOperaSymbol()){
-// item.setStandardValue(data.getOperaSymbol() +" " + data.getUpperLimit());
-// }
-// }
+
+ if (data.getUpperLimit() > 0.0 && StringUtils.isNotEmpty(data.getOperaSymbol())) {
+ item.setOperaSymbol(data.getOperaSymbol() + " " + data.getUpperLimit());
+ }
result.add(item);
}
return result;
}
-
- @Override
- public List<CheckStandardData> getCheckStandard(String companyId, String deptId, String foodVariety) {
- if (StringUtils.isEmpty(companyId)) {
- companyId = ContextUtil.getDefaultCompanyId();
- }
- if (StringUtils.isEmpty(deptId)) {
- companyId = ContextUtil.subDeptId(ContextUtil.getLoginUser());
- }
-
- return checkStandardMapper.getCheckStandard(companyId, deptId, foodVariety);
- }
-
}
--
Gitblit v1.9.3