From f088078e626e16b28d69cdbcbf514b30f1dcefe7 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 22 四月 2026 11:51:58 +0800
Subject: [PATCH] refactor(production): 优化生产订单及工单号生成逻辑
---
src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java b/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
index 42ca0ba..6b70139 100644
--- a/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
+++ b/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
@@ -127,9 +127,12 @@
private Long tenantId;
/**
- * 瀹℃壒绫诲瀷 1-鍏嚭绠＄悊 2-璇峰亣绠＄悊 3-鍑哄樊绠＄悊 4-鎶ラ攢绠＄悊 5-閲囪喘瀹℃壒 6-鎶ヤ环瀹℃壒 7-鍙戣揣瀹℃壒
+ * 瀹℃壒绫诲瀷 1-鍏嚭绠＄悊 2-璇峰亣绠＄悊 3-鍑哄樊绠＄悊 4-鎶ラ攢绠＄悊 5-閲囪喘瀹℃壒 6-鎶ヤ环瀹℃壒 7-鍙戣揣瀹℃壒 8-鍗遍櫓浣滀笟瀹℃壒
*/
private Integer approveType;
+
+ @TableField(exist = false)
+ private String approveTypeName;
/**
* 瀹℃壒澶囨敞
@@ -138,16 +141,16 @@
private String approveRemark;
@Excel(name = "寮�濮嬫椂闂�", dateFormat = "yyyy-MM-dd",width = 30)
- @JsonFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "寮�濮嬫椂闂�")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private Date startDate;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime startDate;
@Excel(name = "缁撴潫鏃堕棿", dateFormat = "yyyy-MM-dd",width = 30)
- @JsonFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "缁撴潫鏃堕棿")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private Date endDate;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime endDate;
private BigDecimal price;
@@ -168,4 +171,11 @@
private static final long serialVersionUID = 1L;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
--
Gitblit v1.9.3