From 215485725d2aa0b17f7b0e965163ab13924fa1e4 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 31 八月 2023 13:45:57 +0800
Subject: [PATCH] 文档名称来源 修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardWorkInstructionMapper.xml | 4 ++--
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentDocumentController.java | 4 ++--
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrderOperationGuidance.java | 2 +-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentDocument.java | 5 +++--
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentDocumentController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentDocumentController.java
index 094b743..379cf43 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentDocumentController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentDocumentController.java
@@ -126,7 +126,7 @@
String type = json.getString("type");
EquipmentDocument equipmentDocument = json.toJavaObject(EquipmentDocument.class);
- equipmentDocument.setType(fileType);
+ equipmentDocument.setFileType(fileType);
equipmentDocumentService.save(equipmentDocument);
// 鏂囦欢鍙樻洿
if (isFileChange) {
@@ -166,7 +166,7 @@
String type = json.getString("type");
EquipmentDocument equipmentDocument = json.toJavaObject(EquipmentDocument.class);
- equipmentDocument.setType(fileType);
+ equipmentDocument.setFileType(fileType);
equipmentDocumentService.saveOrUpdate(equipmentDocument);
// 鏂囦欢鍙樻洿
if (isFileChange) {
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentDocument.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentDocument.java
index 7a3586e..d96ca75 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentDocument.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentDocument.java
@@ -46,8 +46,9 @@
/**鏂囨。绫诲瀷*/
@Excel(name = "鏂囨。绫诲瀷", width = 15)
@ApiModelProperty(value = "鏂囨。绫诲瀷")
- @Dict(dicCode = "common_upload_type")
- private String type;
+// @Dict(dicCode = "common_upload_type")
+ @Dict(dictTable = "mom_eam_document_type",dicCode = "id",dicText = "name")
+ private String fileType;
/**澶囩敤瀛楁1*/
@Excel(name = "澶囩敤瀛楁1", width = 15)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrderOperationGuidance.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrderOperationGuidance.java
index 2da52d2..af91c79 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrderOperationGuidance.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrderOperationGuidance.java
@@ -39,7 +39,7 @@
/**鏂囨。绫诲瀷*/
@Excel(name = "鏂囨。绫诲瀷", width = 15)
@ApiModelProperty(value = "鏂囨。绫诲瀷")
- @Dict(dicCode = "common_upload_type")
+ @Dict(dictTable = "mom_eam_document_type",dicCode = "id",dicText = "name")
private String documentTypeId;
/**鏂囨。鍚嶇О*/
@Excel(name = "鏂囨。鍚嶇О", width = 15)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardWorkInstructionMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardWorkInstructionMapper.xml
index d88ed42..8cbfb9c 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardWorkInstructionMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardWorkInstructionMapper.xml
@@ -8,12 +8,12 @@
t1.num,
t2.name,
t2.type,
- t3.item_text AS typeName,
+ t3.name AS typeName,
t2.size
FROM
mom_eam_maintenance_standard_work_instruction t1
LEFT JOIN mom_sys_upload t2 ON t1.work_instruction_id = t2.id
- LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'common_upload_type' ) t3 ON t3.item_value = t2.type
+ LEFT JOIN mom_eam_document_type t3 ON t3.id = t2.type
WHERE t1.del_flag = 0
<if test="params.maintenanceStandardId != null and params.maintenanceStandardId != ''">
and t1.maintenance_standard_id = #{params.maintenanceStandardId}
--
Gitblit v1.9.3