From b069101e1bf347ceab11e33d73b2fbb7f37d4686 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 25 四月 2026 17:15:53 +0800
Subject: [PATCH] feat(production): 生产订单的工艺路线和参数的增删改逻辑
---
src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java
index 6525fc3..d655683 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java
@@ -1,8 +1,11 @@
package com.ruoyi.collaborativeApproval.pojo;
import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
@@ -15,35 +18,44 @@
/**
* 鐢宠缂栧彿
*/
- @ApiModelProperty("鐢宠缂栧彿")
+ @Schema(description = "鐢宠缂栧彿")
+ @Excel(name = "鐢宠缂栧彿")
private String applicationNum;
/**
* 鍏憡鏍囬
*/
- @ApiModelProperty("鍏憡鏍囬")
+ @Schema(description = "鍏憡鏍囬")
+ @Excel(name = "鐢宠鏍囬")
private String title;
/**
* 鐢ㄥ嵃绫诲瀷
*/
- @ApiModelProperty("鐢ㄥ嵃绫诲瀷")
+ @Schema(description = "鐢ㄥ嵃绫诲瀷")
+ @Excel(name = "鐢ㄥ嵃绫诲瀷", readConverterExp = "official=鍏珷,contract=鍚堝悓涓撶敤绔�,finance=璐㈠姟涓撶敤绔�,legal=娉曚汉绔�")
private String sealType;
/**
* 鐢宠鐢ㄥ嵃鍘熷洜
*/
- @ApiModelProperty("鐢宠鐢ㄥ嵃鍘熷洜")
+ @Schema(description = "鐢宠鐢ㄥ嵃鍘熷洜")
private String reason;
/**
* 绱ф�ョ▼搴�
*/
- @ApiModelProperty("绱ф�ョ▼搴�")
+ @Schema(description = "绱ф�ョ▼搴�")
private String urgency;
/**
* 鐘舵��
*/
- @ApiModelProperty("鐘舵��")
+ @Schema(description = "鐘舵��")
+ @Excel(name = "鐘舵��", readConverterExp = "pending=寰呭鎵�,approved=宸查�氳繃,rejected=宸叉嫆缁�")
private String status;
+
+ /**
+ * 瀹℃壒浜�
+ */
+ private Long approveUserId;
/**
* 鍒涘缓鑰�
*/
@@ -54,10 +66,15 @@
* 鍒涘缓鏃堕棿
*/
@TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
/**
* 绉熸埛ID
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
--
Gitblit v1.9.3