设备保养-任务记录增加备注字段； 供应商档案增加供应商类型字段，由字典维护；

huminmin

2026-02-27 4eeb403ab81c2cd88e2f8004913afff64f0142e3

设备保养-任务记录增加备注字段；
供应商档案增加供应商类型字段，由字典维护；

 doc/20260227_add_remark_to_device_maintenance.sql

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,2 @@
alter table device_maintenance
    add remark varchar(255) null comment '备注';

 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 '备注';

 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;


 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;

 src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java

@@ -66,4 +66,7 @@

    @ApiModelProperty("创建人名称")
    private String createUserName;

    @ApiModelProperty("备注")
    private String Remark;
}

 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")

 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,

 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