From dd69bfc1fb8e5e28dde754fab7f23bfb1a18faa5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 05 六月 2026 16:58:07 +0800
Subject: [PATCH] config(dev): 更新开发环境配置和文件上传功能 - 调整文件上传路径配置 - 修复OA环境文件链接前缀配置 - 在审批实例服务中添加报销相关数据删除逻辑 - 实现申请人姓名自动填充功能 - 添加文件下载预览路由的正则表达式支持 - 为企业新闻VO添加附件列表兼容别名 - 完善员工入职服务的异常处理 - 新增账户附件管理控制器 - 实现文件上传接口并返回完整文件信息
---
src/main/java/com/ruoyi/safe/pojo/SafeAccident.java | 42 ++++++++++++++++++++++--------------------
1 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/ruoyi/safe/pojo/SafeAccident.java b/src/main/java/com/ruoyi/safe/pojo/SafeAccident.java
index 8bbc898..74a46b6 100644
--- a/src/main/java/com/ruoyi/safe/pojo/SafeAccident.java
+++ b/src/main/java/com/ruoyi/safe/pojo/SafeAccident.java
@@ -10,8 +10,7 @@
import java.time.LocalDateTime;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
@@ -27,7 +26,7 @@
@Getter
@Setter
@TableName("safe_accident")
-@ApiModel(value = "SafeAccident瀵硅薄", description = "瀹夊叏鐢熶骇--浜嬫晠涓婃姤璁板綍")
+@Schema(name = "SafeAccident瀵硅薄", description = "瀹夊叏鐢熶骇--浜嬫晠涓婃姤璁板綍")
public class SafeAccident implements Serializable {
private static final long serialVersionUID = 1L;
@@ -35,61 +34,61 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty("浜嬫晠缂栧彿")
+ @Schema(description = "浜嬫晠缂栧彿")
private String accidentCode;
- @ApiModelProperty("浜嬫晠鍚嶇О")
+ @Schema(description = "浜嬫晠鍚嶇О")
private String accidentName;
- @ApiModelProperty("浜嬫晠绫诲瀷")
+ @Schema(description = "浜嬫晠绫诲瀷")
private String accidentType;
- @ApiModelProperty("浜嬫晠鍙戠敓鏃堕棿")
+ @Schema(description = "浜嬫晠鍙戠敓鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime happenTime;
- @ApiModelProperty("浜嬫晠鍙戠敓浣嶇疆")
+ @Schema(description = "浜嬫晠鍙戠敓浣嶇疆")
private String happenLocation;
- @ApiModelProperty("浜嬫晠绛夌骇")
+ @Schema(description = "浜嬫晠绛夌骇")
private String accidentGrade;
- @ApiModelProperty("浜嬫晠鐩存帴鍘熷洜")
+ @Schema(description = "浜嬫晠鐩存帴鍘熷洜")
private String accidentCause;
- @ApiModelProperty("浜嬫晠鏍规湰鍘熷洜")
+ @Schema(description = "浜嬫晠鏍规湰鍘熷洜")
private String rootCause;
- @ApiModelProperty("浜哄憳鎹熷け鎯呭喌")
+ @Schema(description = "浜哄憳鎹熷け鎯呭喌")
private String personLoss;
- @ApiModelProperty("鐩存帴璐骇鎹熷け锛堝厓锛� ")
+ @Schema(description = "鐩存帴璐骇鎹熷け锛堝厓锛� ")
private BigDecimal assetLoss;
- @ApiModelProperty("鐢熶骇褰卞搷鎯呭喌")
+ @Schema(description = "鐢熶骇褰卞搷鎯呭喌")
private String productionLoss;
- @ApiModelProperty("鐜板満搴旀�ュ缃帾鏂�")
+ @Schema(description = "鐜板満搴旀�ュ缃帾鏂�")
private String handleMeasures;
- @ApiModelProperty("浜嬫晠璐ｄ换浜�")
+ @Schema(description = "浜嬫晠璐ｄ换浜�")
private String responsiblePerson;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
- @ApiModelProperty("涓婃姤鏃堕棿")
+ @Schema(description = "涓婃姤鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @ApiModelProperty("涓婃姤浜篿d")
+ @Schema(description = "涓婃姤浜篿d")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty("涓婃姤浜�")
+ @Schema(description = "涓婃姤浜�")
@TableField(exist = false)
private String createUserName;
@@ -103,4 +102,7 @@
@TableField(fill = FieldFill.INSERT)
private Integer tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
--
Gitblit v1.9.3