From 53577ae0fcba9342b22ad1758303aa61409160d1 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 12 九月 2025 19:10:58 +0800
Subject: [PATCH] art: 设备保养标准导入问题修改
---
src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandard.java | 6 ---
src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java | 16 ++++----
src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java | 33 +++++-----------
src/main/java/org/jeecg/modules/eam/dto/MaintenanceStandardImport.java | 16 ++++----
src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java | 4 +-
src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java | 16 ++++----
6 files changed, 36 insertions(+), 55 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java b/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java
index a43dc02..a9025c6 100644
--- a/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java
+++ b/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java
@@ -44,10 +44,7 @@
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@@ -311,13 +308,8 @@
ImportParams params = new ImportParams();
params.setTitleRows(2); // 璺宠繃鍓�2琛屾爣棰�
- params.setHeadRows(1); // 绗�3琛屾槸琛ㄥご
+ params.setHeadRows(2); // 绗�3琛屾槸琛ㄥご
params.setSheetNum(1); // 璇诲彇绗竴涓伐浣滆〃
-
- int dataEndRow = findDataEndRow(file.getInputStream());
- log.info("璁＄畻鍑虹殑鏁版嵁缁撴潫琛�: {}", dataEndRow);
-
- params.setLastOfInvalidRow(dataEndRow);
params.setNeedSave(true);
EamMaintenanceStandardRequest standardRequest = new EamMaintenanceStandardRequest();
@@ -342,22 +334,17 @@
List<MaintenanceStandardImport> list = ExcelImportUtil.importExcel(file.getInputStream(), MaintenanceStandardImport.class, params);
log.info("瀹為檯璇诲彇鍒扮殑鏄庣粏鏁伴噺: {}", list.size());
-
- // 鎵撳嵃鍓嶅嚑鏉¤褰曠敤浜庤皟璇�
- if (!list.isEmpty()) {
- log.info("鍓�3鏉¤褰曡鎯�:");
- for (int i = 0; i < Math.min(3, list.size()); i++) {
- MaintenanceStandardImport item = list.get(i);
- log.info("绗瑊}鏉�: NO={}, 鐐规鏉′欢={}, 閮ㄤ綅鍚嶇О={}, 鐐规鍐呭={}",
- i+1, item.getItemCode(), item.getCondition(),
- item.getItemPart(), item.getItemName());
+ //鏄庣粏椤�
+ List<EamMaintenanceStandardDetail> tableList = new ArrayList<>();
+ for(MaintenanceStandardImport maintenanceStandardImport : list) {
+ try {
+ Integer.valueOf(maintenanceStandardImport.getItemCode());
+ } catch (NumberFormatException e) {
+ break;
}
- } else {
- log.warn("鏈鍙栧埌浠讳綍鏄庣粏璁板綍");
+ tableList.add(new EamMaintenanceStandardDetail(maintenanceStandardImport));
}
- //鏄庣粏椤�
- List<EamMaintenanceStandardDetail> tableList = list.stream().map(EamMaintenanceStandardDetail::new).collect(Collectors.toList());
standardRequest.setTableDetailList(tableList);
log.info("杞崲鍚庣殑鏄庣粏鏁伴噺: {}", tableList.size());
diff --git a/src/main/java/org/jeecg/modules/eam/dto/MaintenanceStandardImport.java b/src/main/java/org/jeecg/modules/eam/dto/MaintenanceStandardImport.java
index f054b30..b930278 100644
--- a/src/main/java/org/jeecg/modules/eam/dto/MaintenanceStandardImport.java
+++ b/src/main/java/org/jeecg/modules/eam/dto/MaintenanceStandardImport.java
@@ -26,28 +26,28 @@
- @Excel(name = "NO", orderNum = "1")
+ @Excel(name = "NO")
private String itemCode;
- @Excel(name = "鐐规鏉′欢", orderNum = "2")
+ @Excel(name = "鐐规鏉′欢")
private String condition;
- @Excel(name = "閮ㄤ綅鍚嶇О", orderNum = "3")
+ @Excel(name = "閮ㄤ綅鍚嶇О")
private String itemPart;
- @Excel(name = "鐐规鍐呭", orderNum = "4")
+ @Excel(name = "鐐规鍐呭")
private String itemName;
- @Excel(name = "鐐规鏂规硶", orderNum = "5")
+ @Excel(name = "鐐规鏂规硶")
private String subItemName;
- @Excel(name = "鍩哄噯", orderNum = "6")
+ @Excel(name = "鍩哄噯")
private String itemDemand;
- @Excel(name = "寮傚父澶勭悊鍩哄噯", orderNum = "7")
+ @Excel(name = "寮傚父澶勭悊鍩哄噯")
private String abnormal;
- @Excel(name = "鍛ㄦ湡", orderNum = "8")
+ @Excel(name = "鍛ㄦ湡")
private String period;
}
diff --git a/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java b/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java
index 9ce89d0..e2a6fc7 100644
--- a/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java
+++ b/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java
@@ -83,9 +83,9 @@
/**
* 浣跨敤閮ㄩ棬
*/
- @Excel(name = "浣跨敤杞﹂棿", width = 25, dictTable = "mdc_production", dicText = "production_name", dicCode = "id", orderNum = "9")
+ @Excel(name = "浣跨敤杞﹂棿", width = 25, dictTable = "base_factory", dicText = "factory_name", dicCode = "id", orderNum = "9")
@ApiModelProperty(value = "浣跨敤閮ㄩ棬")
- @Dict(dicCode = "mdc_production, production_name, id")
+ @Dict(dicCode = "base_factory, factory_name, id")
private String orgId;
/**
* 璁惧绠＄悊鍛�
diff --git a/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandard.java b/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandard.java
index 5dabd18..e93dcae 100644
--- a/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandard.java
+++ b/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandard.java
@@ -115,12 +115,6 @@
*/
@ApiModelProperty(value = "鍙傝�冩枃浠�")
private String referenceFile;
- /**
- * 鏈�鏂扮敓鎴愬伐鍗曟椂闂�
- * 涓嬩竴娆＄敓鎴愭椂闂翠负姝ゆ椂闂� + 淇濆吇鍛ㄦ湡
- */
- @ApiModelProperty(value = "鏈�鏂扮敓鎴愬伐鍗曟椂闂�")
- private Date lastGenerateTime;
//鍒楄〃灞曠ず
@TableField(exist = false)
diff --git a/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java b/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
index 968e0e3..a46ac13 100644
--- a/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
@@ -103,14 +103,14 @@
if (sysUser == null) {
return page;
}
- if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) {
- //閫夋嫨浜嗚澶囷紝鏍规嵁璁惧id杩囨护璁惧
- List<String> equipArr = Arrays.asList(sysUser.getEquipmentIds().split(","));
- queryWrapper.in("e.equipment_code", equipArr);
- } else {
- //娌℃湁閫夋嫨璁惧锛屾牴鎹溅闂磋繃婊よ澶�
- queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=e.org_id", sysUser.getId());
- }
+// if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) {
+// //閫夋嫨浜嗚澶囷紝鏍规嵁璁惧id杩囨护璁惧
+// List<String> equipArr = Arrays.asList(sysUser.getEquipmentIds().split(","));
+// queryWrapper.in("e.equipment_code", equipArr);
+// } else {
+// //娌℃湁閫夋嫨璁惧锛屾牴鎹溅闂磋繃婊よ澶�
+// queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=e.org_id", sysUser.getId());
+// }
//鏌ヨ鏉′欢杩囨护
if (eamEquipment != null) {
if (StringUtils.isNotBlank(eamEquipment.getEquipmentCode())) {
diff --git a/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java b/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
index 1315ecf..45637b6 100644
--- a/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
@@ -55,14 +55,14 @@
if (sysUser == null) {
return page;
}
- if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) {
- //閫夋嫨浜嗚澶囷紝鏍规嵁璁惧id杩囨护璁惧
- List<String> equipArr = Arrays.asList(sysUser.getEquipmentIds().split(","));
- queryWrapper.in("e.equipment_code", equipArr);
- } else {
- //娌℃湁閫夋嫨璁惧锛屾牴鎹溅闂磋繃婊よ澶�
- queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=e.org_id ", sysUser.getId());
- }
+// if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) {
+// //閫夋嫨浜嗚澶囷紝鏍规嵁璁惧id杩囨护璁惧
+// List<String> equipArr = Arrays.asList(sysUser.getEquipmentIds().split(","));
+// queryWrapper.in("e.equipment_code", equipArr);
+// } else {
+// //娌℃湁閫夋嫨璁惧锛屾牴鎹溅闂磋繃婊よ澶�
+// queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=e.org_id ", sysUser.getId());
+// }
if(eamMaintenanceStandard != null) {
//缂栫爜 妯＄硦鏌ヨ
if(StringUtils.isNotBlank(eamMaintenanceStandard.getStandardCode())) {
--
Gitblit v1.9.3