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/inspectiontask/pojo/InspectionTask.java | 60 +++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 41 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java b/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java
index 4d95a96..4e7efad 100644
--- a/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java
+++ b/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java
@@ -3,8 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -15,7 +14,7 @@
* @date : 2025/9/19 10:25
*/
@Data
-@ApiModel
+@Schema
@TableName("inspection_task")
public class InspectionTask {
@@ -27,68 +26,91 @@
@TableId(type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value = "璁惧鍚嶇О")
+ @Schema(description = "璁惧鍚嶇О")
@Excel(name = "宸℃浠诲姟鍚嶇О")
private String taskName;
- @ApiModelProperty(value = "璁惧id")
+ @Schema(description = "宸℃椤圭洰")
+ @Excel(name = "宸℃椤圭洰")
+ private String inspectionProject;
+
+ @Schema(description = "璁惧id")
private Integer taskId;
- @ApiModelProperty(value = "宸℃浜篒D")
+ @Schema(description = "宸℃浜篒D")
private String inspectorId;
- @ApiModelProperty(value = "鎵ц宸℃鐨勪汉鍛樺鍚�")
+ @Schema(description = "鎵ц宸℃鐨勪汉鍛樺鍚�")
@Excel(name = "鎵ц宸℃浜哄憳")
private String inspector;
- @ApiModelProperty(value = "浠诲姟闄勫姞璇存槑鎴栫壒娈婃儏鍐佃褰�")
+ @Schema(description = "浠诲姟闄勫姞璇存槑鎴栫壒娈婃儏鍐佃褰�")
@Excel(name = "澶囨敞")
private String remarks;
- @ApiModelProperty(value = "浠诲姟鐧昏浜篒D")
+ @Schema(description = "宸℃缁撴灉 0 寮傚父 1 姝ｅ父")
+ private String inspectionResult;
+
+ @Schema(description = "寮傚父鎻忚堪")
+ private String abnormalDescription;
+
+ @Schema(description = "鍏宠仈缁翠慨鍗旾D")
+ private Long deviceRepairId;
+
+ @Schema(description = "楠屾敹浜篒D")
+ private Long acceptanceUserId;
+
+ @Schema(description = "楠屾敹浜�")
+ @Excel(name = "楠屾敹浜�")
+ private String acceptanceName;
+
+ @Schema(description = "浠诲姟鐧昏浜篒D")
private Long registrantId;
- @ApiModelProperty(value = "浠诲姟鐧昏浜哄鍚�")
+ @Schema(description = "浠诲姟鐧昏浜哄鍚�")
@Excel(name = "鐧昏浜�")
private String registrant;
- @ApiModelProperty(value = "棰戞")
+ @Schema(description = "棰戞")
@Excel(name = "棰戞")
private String frequencyType;
- @ApiModelProperty(value = "鏃堕棿缁嗚妭")
+ @Schema(description = "鏃堕棿缁嗚妭")
@Excel(name = "寮�濮嬫棩鏈熶笌鏃堕棿")
private String frequencyDetail;
- @ApiModelProperty(value = "宸℃鍦扮偣璇︾粏鎻忚堪")
+ @Schema(description = "宸℃鍦扮偣璇︾粏鎻忚堪")
private String inspectionLocation;
- @ApiModelProperty(value = "杞垹闄ゆ爣蹇楋紝0=鏈垹闄わ紝1=宸插垹闄�")
+ @Schema(description = "杞垹闄ゆ爣蹇楋紝0=鏈垹闄わ紝1=宸插垹闄�")
private Integer deleted;
- @ApiModelProperty(value = "鍒涘缓璇ヨ褰曠殑鐢ㄦ埛")
+ @Schema(description = "鍒涘缓璇ヨ褰曠殑鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "璁板綍鍒涘缓鏃堕棿")
+ @Schema(description = "璁板綍鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鐧昏鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @ApiModelProperty(value = "鏈�鍚庝慨鏀硅璁板綍鐨勭敤鎴�")
+ @Schema(description = "鏈�鍚庝慨鏀硅璁板綍鐨勭敤鎴�")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "璁板綍鏈�鍚庢洿鏂版椂闂�")
+ @Schema(description = "璁板綍鏈�鍚庢洿鏂版椂闂�")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "绉熸埛")
+ @Schema(description = "绉熸埛")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
@TableField(exist = false)
private String dateStr;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
--
Gitblit v1.9.3