From fff5ef18854efe6a4eb03049a1ddcc16edb0087e Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 04 六月 2025 14:18:59 +0800
Subject: [PATCH] 台账导入修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml | 4
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java | 33 ++++++++--
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 100 ++++++++++++++++++++++++++++++++-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java | 1
4 files changed, 125 insertions(+), 13 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 90cc38b..cb0d4f8 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
@@ -978,7 +978,7 @@
.setEquipmentUda4(equipmentImportVo.getEquipmentUda4())
.setEquipmentUda5(equipmentImportVo.getEquipmentUda5())
.setLocation(equipmentImportVo.getLocation())
- .setLastVerificationDate(equipmentImportVo.getLeaveFactoryDate())
+ .setLeaveFactoryDate(equipmentImportVo.getLeaveFactoryDate())
.setProjectApprovalNo(equipmentImportVo.getProjectApprovalNo())
.setFundSource(equipmentImportVo.getFundSource())
.setAcceptanceCheckDate(equipmentImportVo.getAcceptanceCheckDate())
@@ -986,9 +986,14 @@
.setSourceCountry(equipmentImportVo.getSourceCountry())
.setModel(equipmentImportVo.getModel())
.setSpecification(equipmentImportVo.getSpecification())
- .setPropertyStatus("normal")
+ .setPropertyStatus(equipmentImportVo.getPropertyStatus())
+ .setOperatingSystem(equipmentImportVo.getOperatingSystem())
.setWarrantyStart(equipmentImportVo.getWarrantyStart())
.setWarrantyEnd(equipmentImportVo.getWarrantyEnd())
+ .setCreateBy(equipmentImportVo.getCreateBy())
+ .setCreateTime(equipmentImportVo.getCreateTime())
+ .setUpdateBy(equipmentImportVo.getUpdateBy())
+ .setUpdateTime(equipmentImportVo.getUpdateTime())
.setIsLineEquip("no")
.setIsLine("no")
.setNextTechnologyStatusQualificationTime(equipmentImportVo.getNextTechnologyStatusQualificationTime())
@@ -1036,11 +1041,100 @@
Date date = DateUtils.getDayAfter(equipment.getThirdMaintenanceTime(), checkPeriod);
equipment.setNextThirdMaintenanceTime(date);
}
- equipmentService.save(equipment);
+ equipmentService.saveOrUpdate(equipment);
}else {
exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐ワ紝鍘熷洜锛氱粺涓�缂栫爜宸插瓨鍦紝鏁版嵁閲嶅瀵煎叆;";
exceptionNum++;
continue;
+// oriEquipment.setUseId(equipment.getUseId());
+// oriEquipment.setWorkCenterId(equipment.getWorkCenterId());
+// oriEquipment.setFactoryModelId(equipment.getFactoryModelId());
+// oriEquipment.setAreaId(equipment.getAreaId());
+// oriEquipment.setManageId(equipment.getManageId());
+// oriEquipment.setEquipmentCategoryId(equipment.getEquipmentCategoryId());
+// oriEquipment.setTeamId(equipment.getTeamId());
+// oriEquipment.setConstructorId(equipment.getConstructorId());
+// oriEquipment.setNum(equipmentImportVo.getNum())
+// .setName(equipmentImportVo.getName())
+// .setTechnologyStatus(equipmentImportVo.getTechnologyStatus())
+// .setEquipmentImportanceId(equipmentImportVo.getEquipmentImportanceId())
+// .setSpecificEquipment(equipmentImportVo.getKeyEquipmentIdentification())
+// .setSecurityConfiguration(equipmentImportVo.getSecurityConfiguration())
+// .setCoolingSystem(equipmentImportVo.getCoolingSystem())
+// .setFireExtinguisher(equipmentImportVo.getFireExtinguisher())
+// .setFireExtinguisherValidityPeriod(equipmentImportVo.getFireExtinguisherValidityPeriod())
+// .setSystem(equipmentImportVo.getSystem())
+// .setPort(equipmentImportVo.getPort())
+// .setCoordinateNum(equipmentImportVo.getCoordinateNum())
+// .setEquipmentStatus(equipmentImportVo.getEquipmentStatus())
+// .setEquipmentUda3(equipmentImportVo.getEquipmentUda3())
+// .setEquipmentUda4(equipmentImportVo.getEquipmentUda4())
+// .setEquipmentUda5(equipmentImportVo.getEquipmentUda5())
+// .setLocation(equipmentImportVo.getLocation())
+// .setLeaveFactoryDate(equipmentImportVo.getLeaveFactoryDate())
+// .setProjectApprovalNo(equipmentImportVo.getProjectApprovalNo())
+// .setFundSource(equipmentImportVo.getFundSource())
+// .setAcceptanceCheckDate(equipmentImportVo.getAcceptanceCheckDate())
+// .setFactoryNumber(equipmentImportVo.getFactoryNumber())
+// .setSourceCountry(equipmentImportVo.getSourceCountry())
+// .setModel(equipmentImportVo.getModel())
+// .setSpecification(equipmentImportVo.getSpecification())
+// .setPropertyStatus(equipmentImportVo.getPropertyStatus())
+// .setOperatingSystem(equipmentImportVo.getOperatingSystem())
+// .setWarrantyStart(equipmentImportVo.getWarrantyStart())
+// .setWarrantyEnd(equipmentImportVo.getWarrantyEnd())
+// .setCreateBy(equipmentImportVo.getCreateBy())
+// .setCreateTime(equipmentImportVo.getCreateTime())
+// .setUpdateBy(equipmentImportVo.getUpdateBy())
+// .setUpdateTime(equipmentImportVo.getUpdateTime())
+// .setIsLineEquip("no")
+// .setIsLine("no")
+// .setNextTechnologyStatusQualificationTime(equipmentImportVo.getNextTechnologyStatusQualificationTime())
+// .setThirdMaintenanceTime(equipmentImportVo.getThirdMaintenanceTime())
+// .setTechnologyStatusQualificationTime(equipmentImportVo.getTechnologyStatusQualificationTime())
+// .setGpo(equipmentImportVo.getGpo());
+// if(equipmentCategory.getEquipmentCategoryUda1().equals("weldingMachine")){
+// oriEquipment.setCheckPeriod(365*3+"");
+// }
+// if(equipmentCategory.getEquipmentCategoryUda1().equals("filesCarousel")){
+// oriEquipment.setCheckPeriod(365*4+"");
+// }
+// if(equipmentCategory.getEquipmentCategoryUda1().equals("tester")){
+// oriEquipment.setCheckPeriod(365*1+"");
+// }
+// if(
+// !equipmentCategory.getEquipmentCategoryUda1().equals("weldingMachine")
+// &&!equipmentCategory.getEquipmentCategoryUda1().equals("filesCarousel")
+// &&!equipmentCategory.getEquipmentCategoryUda1().equals("tester")
+// ){
+// if(StringUtils.isNotBlank(abc)){
+// if(abc.equals("A")){
+// oriEquipment.setCheckPeriod(365*3+"");
+// }
+// if(
+// abc.equals("B")
+// ||abc.equals("C")
+// ||abc.equals("D")
+// ){
+// oriEquipment.setCheckPeriod(365*4+"");
+// }
+// }
+// }
+// //涓嬫涓変繚鏃ユ湡澶勭悊
+// if(oriEquipment.getThirdMaintenanceTime() == null && oriEquipment.getAcceptanceCheckDate() != null && StringUtils.isNotBlank(oriEquipment.getCheckPeriod())){
+// //濡傛灉娌℃湁涓変繚鏃ユ湡 鎸夌収楠屾敹鏃ユ湡璁＄畻涓嬫涓変繚鏃ユ湡
+// int checkPeriod = Integer.parseInt(oriEquipment.getCheckPeriod()) - 1;
+// LocalDate acceptanceCheckDate = LocalDate.parse(oriEquipment.getAcceptanceCheckDate());
+// LocalDate localDate = acceptanceCheckDate.plusDays(checkPeriod);
+// Date date = DateUtils.str2Date(localDate.toString(), DateUtils.date_sdf.get());
+// oriEquipment.setNextThirdMaintenanceTime(date);
+// }else if(oriEquipment.getThirdMaintenanceTime() != null && StringUtils.isNotBlank(oriEquipment.getCheckPeriod())){
+// //濡傛灉鏈変笁淇濇棩鏈� 鍒欎娇鐢ㄤ笁淇濇棩鏈熻绠� 涓嬫涓変繚鏃ユ湡
+// int checkPeriod = Integer.parseInt(oriEquipment.getCheckPeriod()) - 1;
+// Date date = DateUtils.getDayAfter(oriEquipment.getThirdMaintenanceTime(), checkPeriod);
+// oriEquipment.setNextThirdMaintenanceTime(date);
+// }
+// equipmentService.updateById(oriEquipment);
}
}
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
index 1698a38..7dfe3be 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
@@ -263,6 +263,7 @@
private String fireExtinguisherValidityPeriod;
@Excel(name = "鎿嶄綔绯荤粺", width = 15,orderNum = "13")
@ApiModelProperty(value = "鎿嶄綔绯荤粺")
+ @Dict(dicCode = "operation_flag")
private String operatingSystem;
@Excel(name = "绯荤粺", width = 15,orderNum = "14")
@ApiModelProperty(value = "绯荤粺")
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java
index 1a5af69..88e9535 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java
@@ -73,6 +73,9 @@
@Excel(name = "鐏伀鍣ㄦ湁鏁堟湡")
private String fireExtinguisherValidityPeriod;
+ @Excel(name = "鎿嶄綔绯荤粺",dicCode = "operation_flag")
+ private String operatingSystem;
+
@Excel(name = "绯荤粺")
private String system;
@@ -109,26 +112,26 @@
@Excel(name = "鍑哄巶缂栧彿")
private String factoryNumber;
- @Excel(name = "璧勪骇鐨勬潵婧愬浗瀹�")
+ @Excel(name = "璧勪骇鏉ユ簮鍥藉")
private String sourceCountry;
@Excel(name = "瀹夊叏閰嶇疆")
private String securityConfiguration;
- @Excel(name = "瑙勬牸")
+ @Excel(name = "璁惧瑙勬牸")
private String specification;
@Excel(name = "鎬诲姛鐜�")
private String gpo;
- @Excel(name = "璐ㄤ繚寮�濮嬫棩鏈�",format = "yyyyMMdd")
- private Date warrantyStart;
+ @Excel(name = "璐ㄤ繚寮�濮嬫棩鏈�",format = "yyyy-MM-dd")
+ private java.util.Date warrantyStart;
- @Excel(name = "璐ㄤ繚缁撴潫鏃ユ湡",format = "yyyyMMdd")
- private Date warrantyEnd;
+ @Excel(name = "璐ㄤ繚缁撴潫鏃ユ湡",format = "yyyy-MM-dd")
+ private java.util.Date warrantyEnd;
- @Excel(name = "涓嬫鎶�鏈姸鎬侀壌瀹氭椂闂�", width = 20, format = "yyyyMMdd")
- private Date nextTechnologyStatusQualificationTime;
+ @Excel(name = "涓嬫鎶�鏈姸鎬侀壌瀹氭椂闂�", width = 20, format = "yyyy-MM-dd")
+ private java.util.Date nextTechnologyStatusQualificationTime;
@Excel(name = "涓変繚鏃ユ湡", format = "yyyy-MM-dd")
private java.util.Date thirdMaintenanceTime;
@@ -136,4 +139,18 @@
@Excel(name = "鎶�鏈姸鎬侀壌瀹氭棩鏈�", format = "yyyy-MM-dd")
private java.util.Date technologyStatusQualificationTime;
+ @Excel(name = "鍒涘缓浜�", width = 15)
+ private java.lang.String createBy;
+
+ @Excel(name = "鍒涘缓鏃堕棿", width = 20, format = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private java.util.Date createTime;
+
+ @Excel(name = "鏇存柊浜�", width = 15)
+ private java.lang.String updateBy;
+
+ @Excel(name = "鏇存柊鏃堕棿", width = 20, format = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private java.util.Date updateTime;
+
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
index 5b80b3a..f4e7413 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
@@ -350,8 +350,8 @@
t1.constructor_id constructorId,
t1.supplier_id supplierId,
t1.factory_number factoryNumber,
- t1.leave_factory_date leaveFactoryDate,
- t1.acceptance_check_date acceptanceCheckDate,
+ CONVERT(VARCHAR(10), t1.leave_factory_date, 120) leaveFactoryDate,
+ CONVERT(VARCHAR(10), t1.acceptance_check_date, 120) acceptanceCheckDate,
t1.affiliation_id affiliationId,
t1.manage_id manageId,
t1.manager manager,
--
Gitblit v1.9.3