From 14b1e801322db00b6b0d8dd059b9720adeb21bd8 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期二, 29 八月 2023 11:58:44 +0800
Subject: [PATCH] 设备分类
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionParametersTemplateController.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionParametersTemplateController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionParametersTemplateController.java
index 2ab70b8..1942634 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionParametersTemplateController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionParametersTemplateController.java
@@ -16,6 +16,7 @@
import org.jeecg.common.system.query.QueryGenerator;
//import org.jeecg.modules.base.service.IUnitService;
import org.jeecg.modules.eam.entity.PrecisionParameters;
+import org.jeecg.modules.eam.entity.PrecisionParametersCategory;
import org.jeecg.modules.eam.entity.PrecisionParametersTemplate;
import org.jeecg.modules.eam.entity.PrecisionParametersTemplateDetail;
import org.jeecg.modules.eam.service.IPrecisionParametersCategoryService;
@@ -77,12 +78,29 @@
List<PrecisionParametersTemplateDetail> precisionParametersTemplateDetailList = precisionParametersTemplateDetailService.lambdaQuery().eq(PrecisionParametersTemplateDetail::getPrecisionParametersTemplateId, record.getId()).eq(PrecisionParametersTemplateDetail::getDelFlag, CommonConstant.DEL_FLAG_0).list();
for (PrecisionParametersTemplateDetail precisionParametersTemplateDetail : precisionParametersTemplateDetailList) {
PrecisionParameters precisionParameters = precisionParametersService.getById(precisionParametersTemplateDetail.getPrecisionParametersId());
- precisionParametersTemplateDetail.setPrecisionParametersNum(precisionParameters.getNum());
- precisionParametersTemplateDetail.setPrecisionParametersName(precisionParameters.getName());
- precisionParametersTemplateDetail.setPrecisionParametersCategory(precisionParametersCategoryService.getById(precisionParameters.getPrecisionParametersCategoryId()).getName());
-// precisionParametersTemplateDetail.setUnit(unitService.getById(precisionParameters.getUnitId()).getName());
- String unitName = sysBaseApi.getUnitNameById(precisionParameters.getUnitId());
- precisionParametersTemplateDetail.setUnit(unitName);
+
+ if(precisionParameters != null){
+ String num = precisionParameters.getNum();
+ String name =precisionParameters.getName();
+ if (num!=null){
+ precisionParametersTemplateDetail.setPrecisionParametersNum(num);
+ }
+ if (name!=null){
+ precisionParametersTemplateDetail.setPrecisionParametersName(name);
+ }
+ String id = precisionParameters.getPrecisionParametersCategoryId();
+ if (id!=null){
+ PrecisionParametersCategory precisionParametersCategory = precisionParametersCategoryService.getById(id);
+ precisionParametersTemplateDetail.setPrecisionParametersCategory(precisionParametersCategory.getName());
+ }
+ }else{
+ precisionParametersTemplateDetail.setPrecisionParametersCategory("/");
+ }
+ if (precisionParameters!=null){
+ String unitName = sysBaseApi.getUnitNameById(precisionParameters.getUnitId());
+ precisionParametersTemplateDetail.setUnit(unitName);
+ }
+
}
record.setPrecisionParametersTemplateDetailList(precisionParametersTemplateDetailList);
--
Gitblit v1.9.3