From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
index 85dd8df..33e6449 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
@@ -21,10 +21,7 @@
import org.jeecg.modules.mdc.util.DateUtils;
import org.jeecg.modules.mdc.util.FindsEquipmentDepartUtil;
import org.jeecg.modules.mdc.util.FindsEquipmentProductionUtil;
-import org.jeecg.modules.mdc.vo.MdcEquipmentDepVo;
-import org.jeecg.modules.mdc.vo.MdcEquipmentProVo;
-import org.jeecg.modules.mdc.vo.MdcEquipmentVo;
-import org.jeecg.modules.mdc.vo.WorkshopEquipmentVo;
+import org.jeecg.modules.mdc.vo.*;
import org.jeecg.modules.system.entity.MdcEquipmentDepart;
import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.entity.MdcProductionEquipment;
@@ -759,8 +756,13 @@
Map<String, Object> param = new HashMap<>();
param.put("columns", builder.toString());
param.put("tableName", saveTableName);
- Map<String, Object> map = this.baseMapper.getWorkLineLast(param);
- if (map != null) {
+ Map<String, Object> map = new HashMap<>();
+ try {
+ map = this.baseMapper.getWorkLineLast(param);
+ } catch (Exception e) {
+ log.error("鏌ヨ鍗曡〃鏁版嵁鍑哄樊锛�", e);
+ }
+ if (!map.isEmpty()) {
for (MdcEquipmentThreshold mdcEquipmentThreshold : mdcEquipmentThresholdList) {
Integer actualValue = Integer.valueOf(map.get(mdcEquipmentThreshold.getEnglishName()).toString());
Integer max = mdcEquipmentThreshold.getMaxThreshold();
@@ -837,4 +839,14 @@
return treeList;
}
+ /**
+ * 鏌ヨ鍗曡〃鏁版嵁
+ * @param tableName
+ * @return
+ */
+ @Override
+ public MdcEquipmentDto getWorkLineLast(String tableName) {
+ return this.baseMapper.findWorkLineLast(tableName);
+ }
+
}
--
Gitblit v1.9.3