From bd897b186f4dd82beb5a9f9f7f41555dcd77bf7e Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期三, 07 一月 2026 14:35:46 +0800
Subject: [PATCH] 设备报修增添审批人id，维修价格字段，重整状态对应值。优化添加设备报修接口，同步数据到协同办公-报销管理。协同办公-报销管理的审核接口同步设备管理-设备报修状态。设备报修删除接口根据报销管理审核状态判断是否删除。
---
src/main/java/com/ruoyi/basic/pojo/SupplierManage.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
index 7cdbf17..a18a47b 100644
--- a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
+++ b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
@@ -1,11 +1,12 @@
package com.ruoyi.basic.pojo;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.time.LocalDate;
import java.time.LocalDateTime;
@Data
@@ -16,47 +17,66 @@
private Integer id;
@ApiModelProperty(value = "渚涘簲鍟嗗悕绉�")
+ @Excel(name = "渚涘簲鍟嗗悕绉�")
private String supplierName;
@ApiModelProperty(value = "绾崇◣浜鸿瘑鍒彿")
+ @Excel(name = "绾崇◣浜鸿瘑鍒彿")
private String taxpayerIdentificationNum;
@ApiModelProperty(value = "鍏徃鍦板潃")
+ @Excel(name = "鍏徃鍦板潃")
private String companyAddress;
@ApiModelProperty(value = "鍏徃鐢佃瘽")
+ @Excel(name = "鍏徃鐢佃瘽")
private String companyPhone;
@ApiModelProperty(value = "寮�鎴疯")
+ @Excel(name = "寮�鎴疯")
private String bankAccountName;
@ApiModelProperty(value = "璐﹀彿")
+ @Excel(name = "璐﹀彿")
private String bankAccountNum;
@ApiModelProperty(value = "鑱旂郴浜�")
+ @Excel(name = "鑱旂郴浜�")
private String contactUserName;
@ApiModelProperty(value = "鑱旂郴鐢佃瘽")
+ @Excel(name = "鑱旂郴鐢佃瘽")
private String contactUserPhone;
@ApiModelProperty(value = "缁存姢浜篒D")
+ @Excel(name = "缁存姢浜�")
private Integer maintainUserId;
@ApiModelProperty(value = "缁存姢鏃堕棿")
- private LocalDateTime maintainTime;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+// @Excel(name = "缁存姢鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+ private LocalDate maintainTime;
+ @Excel(name = "鏄惁鐧藉悕鍗�")
+ @ApiModelProperty(value = "鏄惁鐧藉悕鍗曪紙0鏄� 1鍚︼級")
+ private Integer isWhite;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
@ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
private Integer createUser;
@ApiModelProperty(value = "淇敼鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
@ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
@ApiModelProperty(value = "绉熸埛ID")
- private Integer tenantId;
+ @TableField(fill = FieldFill.INSERT)
+ private Long tenantId;
}
--
Gitblit v1.9.3