From c477506a6d672f71c6353608f3cf3424d8026790 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 13 四月 2026 18:18:40 +0800
Subject: [PATCH] refactor(approve): 优化审批流程ID生成逻辑
---
src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java | 37 +++++++++++++++++++++----------------
1 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java b/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java
index a6f4432..73d0933 100644
--- a/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java
+++ b/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java
@@ -1,5 +1,6 @@
package com.ruoyi.device.pojo;
+import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -14,10 +15,6 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
-/**
- * @author :yys
- * @date : 2025/9/19 10:27
- */
@Data
@ApiModel
@TableName("maintenance_task")
@@ -28,9 +25,6 @@
@ApiModelProperty(value = "瑙勬牸鍨嬪彿")
private String deviceModel;
- /**
- * 涓婚敭ID
- */
@TableId(type = IdType.AUTO)
private Long id;
@@ -40,6 +34,20 @@
@ApiModelProperty(value = "璁惧id")
private Long taskId;
+
+ @ApiModelProperty(value = "璁惧鍖哄煙id")
+ private Long areaId;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "璁惧鍖哄煙鍚嶇О")
+ private String areaName;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "璁惧ID闆嗗悎")
+ private Long[] deviceLedgerIds;
+
+ @ApiModelProperty(value = "璁惧ID闆嗗悎瀛楃涓�")
+ private String deviceLedgerIdsStr;
@ApiModelProperty(value = "棰戞")
@Excel(name = "棰戞")
@@ -78,32 +86,29 @@
@ApiModelProperty(value = "鐘舵��")
private String status;
- @ApiModelProperty(value = "杞垹闄ゆ爣蹇楋紝0=鏈垹闄わ紝1=宸插垹闄�")
+ @ApiModelProperty(value = "杞垹闄ゆ爣璁帮紝0=鏈垹闄わ紝1=宸插垹闄�")
private Integer deleted;
@TableField(exist = false)
private String dateStr;
@ApiModelProperty(value = "鍒涘缓璇ヨ褰曠殑鐢ㄦ埛")
- @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
+ @TableField(fill = FieldFill.INSERT)
private Integer createUser;
@ApiModelProperty(value = "璁板綍鍒涘缓鏃堕棿")
- @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
-// @JsonFormat(pattern = "yyyy-MM-dd")
-// @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
@ApiModelProperty(value = "鏈�鍚庝慨鏀硅璁板綍鐨勭敤鎴�")
- @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT_UPDATE)
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
@ApiModelProperty(value = "璁板綍鏈�鍚庢洿鏂版椂闂�")
- @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT_UPDATE)
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
@ApiModelProperty(value = "绉熸埛ID")
- @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
+ @TableField(fill = FieldFill.INSERT)
private Long tenantId;
-
}
--
Gitblit v1.9.3