From 760a63e268e14ea0014a3345d3599f154d43d63f Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 22 四月 2025 13:55:17 +0800
Subject: [PATCH] art: 设备管理-报修-流程
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
index e5a735d..1e3c132 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
@@ -187,6 +187,8 @@
params.setTitleRows(0);
params.setHeadRows(1);
params.setNeedSave(true);
+ params.setStartSheetIndex(0);
+ params.setSheetNum(1);
try {
List<EamEquipment> list = ExcelImportUtil.importExcel(file.getInputStream(), EamEquipment.class, params);
//update-begin-author:taoyan date:20190528 for:鎵归噺鎻掑叆鏁版嵁
@@ -207,10 +209,10 @@
sb.append(String.format("璁惧缂栫爜[%s]浣跨敤杞﹂棿鎴栬澶囩鐞嗗憳涓虹┖锛屾棤娉曞鍏n\n", eamEquipment.getEquipmentCode()));
continue;
}
- if (eamEquipment.getAcceptanceCheckDate() == null) {
- sb.append(String.format("璁惧缂栫爜[%s]楠屾敹涓虹┖锛屾棤娉曞鍏n\r", eamEquipment.getEquipmentCode()));
- continue;
- }
+// if (eamEquipment.getAcceptanceCheckDate() == null) {
+// sb.append(String.format("璁惧缂栫爜[%s]楠屾敹涓虹┖锛屾棤娉曞鍏n\r", eamEquipment.getEquipmentCode()));
+// continue;
+// }
if (StringUtils.isBlank(eamEquipment.getTechnologyStatus())) {
sb.append(String.format("璁惧缂栫爜[%s]鎶�鏈姸鎬佷负绌猴紝鏃犳硶瀵煎叆\n\r", eamEquipment.getEquipmentCode()));
continue;
@@ -220,6 +222,9 @@
sb.append(String.format("璁惧缂栫爜[%s]宸插瓨鍦紝鏃犳硶閲嶅瀵煎叆\n\r", eamEquipment.getEquipmentCode()));
continue;
}
+ if (!CommonConstant.DEFAULT_1.equals(eamEquipment.getMdcFlag())) {
+ eamEquipment.setMdcFlag(CommonConstant.DEFAULT_0);
+ }
EamEquipment equipment = eamEquipmentService.saveEquipment(eamEquipment);
if (equipment == null) {
//淇濆瓨澶辫触锛岃烦杩囨湰娆″惊鐜�
--
Gitblit v1.9.3