From 4eeb403ab81c2cd88e2f8004913afff64f0142e3 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 27 二月 2026 17:46:01 +0800
Subject: [PATCH] 设备保养-任务记录增加备注字段； 供应商档案增加供应商类型字段，由字典维护；
---
src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java | 3 +++
src/main/resources/mapper/device/DeviceMaintenanceMapper.xml | 2 ++
doc/20260227_add_remark_to_device_maintenance.sql | 2 ++
src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java | 3 +++
src/main/resources/mapper/basic/SupplierManageMapper.xml | 2 ++
doc/20260227_add_supplier_type_to_supplier_manage.sql | 5 +++++
src/main/java/com/ruoyi/basic/pojo/SupplierManage.java | 4 ++++
src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java | 2 ++
8 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/doc/20260227_add_remark_to_device_maintenance.sql b/doc/20260227_add_remark_to_device_maintenance.sql
new file mode 100644
index 0000000..65f621a
--- /dev/null
+++ b/doc/20260227_add_remark_to_device_maintenance.sql
@@ -0,0 +1,2 @@
+alter table device_maintenance
+ add remark varchar(255) null comment '澶囨敞';
diff --git a/doc/20260227_add_supplier_type_to_supplier_manage.sql b/doc/20260227_add_supplier_type_to_supplier_manage.sql
new file mode 100644
index 0000000..4d25a0e
--- /dev/null
+++ b/doc/20260227_add_supplier_type_to_supplier_manage.sql
@@ -0,0 +1,5 @@
+alter table supplier_manage
+ add supplier_type varchar(255) null comment '渚涘簲鍟嗗悕绉�';
+
+alter table device_maintenance
+ add remark varchar(255) null comment '澶囨敞';
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java b/src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java
index 29e1af0..b3edb9d 100644
--- a/src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java
+++ b/src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java
@@ -15,6 +15,9 @@
@Excel(name = "渚涘簲鍟嗗悕绉�")
private String supplierName;
+ @Excel(name = "渚涘簲鍟嗙被鍨�")
+ private String supplierType;
+
@Excel(name = "绾崇◣浜鸿瘑鍒彿")
private String taxpayerIdentificationNum;
diff --git a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
index aa33cbf..0e5f106 100644
--- a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
+++ b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
@@ -20,6 +20,10 @@
@Excel(name = "渚涘簲鍟嗗悕绉�")
private String supplierName;
+ @ApiModelProperty(value = "渚涘簲鍟嗙被鍨�")
+ @Excel(name = "渚涘簲鍟嗙被鍨�")
+ private String supplierType;
+
@ApiModelProperty(value = "绾崇◣浜鸿瘑鍒彿")
@Excel(name = "绾崇◣浜鸿瘑鍒彿")
private String taxpayerIdentificationNum;
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
index 522a324..0a0a977 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
@@ -66,4 +66,7 @@
@ApiModelProperty("鍒涘缓浜哄悕绉�")
private String createUserName;
+
+ @ApiModelProperty("澶囨敞")
+ private String Remark;
}
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
index a9368b0..7eff746 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
@@ -42,6 +42,8 @@
private String deviceModel;
+ private String remark;
+
@ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
diff --git a/src/main/resources/mapper/basic/SupplierManageMapper.xml b/src/main/resources/mapper/basic/SupplierManageMapper.xml
index ba7fac3..741b0e3 100644
--- a/src/main/resources/mapper/basic/SupplierManageMapper.xml
+++ b/src/main/resources/mapper/basic/SupplierManageMapper.xml
@@ -8,6 +8,7 @@
SELECT
T1.id,
T1.supplier_name,
+ T1.supplier_type,
T1.taxpayer_identification_num,
T1.company_address,
T1.company_phone,
@@ -40,6 +41,7 @@
SELECT
T1.id,
T1.supplier_name,
+ T1.supplier_type,
T1.taxpayer_identification_num,
T1.company_address,
T1.company_phone,
diff --git a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
index 2ed16a4..a8cdf98 100644
--- a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
+++ b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
@@ -18,6 +18,7 @@
dm.update_user,
dm.tenant_id,
dm.maintenance_actually_name,
+ dm.remark,
dl.device_name,
dl.device_model,
su.nick_name as create_user_name
@@ -63,6 +64,7 @@
dm.update_user,
dm.tenant_id,
dm.maintenance_actually_name,
+ dm.remark,
dl.device_name,
dl.device_model,
su.user_name as create_user_name
--
Gitblit v1.9.3