From 95c90e04b516325648e8a3d69e726555d1f7d05e Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 10 九月 2025 14:51:07 +0800
Subject: [PATCH] 设备借用、归还流程审批调整
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamEquipmentLeanOutRequest.java | 115 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 77 insertions(+), 38 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamEquipmentLeanOutRequest.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamEquipmentLeanOutRequest.java
index d928cd7..e13429b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamEquipmentLeanOutRequest.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamEquipmentLeanOutRequest.java
@@ -43,6 +43,8 @@
* 鍒涘缓鏃堕棿
*/
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 鏇存柊浜�
@@ -53,6 +55,8 @@
* 鏇存柊鏃堕棿
*/
@ApiModelProperty(value = "鏇存柊鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
* 鍒犻櫎鏍囪
@@ -67,22 +71,17 @@
/**
* 鍗曟嵁鍙�
*/
- @Excel(name = "鍗曟嵁鍙�", width = 15)
@ApiModelProperty(value = "鍗曟嵁鍙�")
private String code;
/**
* 鍊熷叆閮ㄩ棬
*/
- @Excel(name = "鍊熷叆閮ㄩ棬", width = 15, dictTable = "mdc_production", dicText = "production_name", dicCode = "id")
@ApiModelProperty(value = "鍊熷叆閮ㄩ棬")
- @Dict(dicCode = "mdc_production, production_name, id")
private String leanDepartId;
/**
* 鍊熷叆璐ｄ换浜�
*/
- @Excel(name = "鍊熷叆璐ｄ换浜�", width = 15)
@ApiModelProperty(value = "鍊熷叆璐ｄ换浜�")
- @Dict(dicCode = "sys_user, realname, username")
private String leanPerson;
/**
* 鍊熺敤鍘熷洜
@@ -90,17 +89,9 @@
@ApiModelProperty(value = "鍊熺敤鍘熷洜")
private String leanReason;
/**
- * 瀹℃壒绫诲瀷
- */
- @ApiModelProperty(value = "瀹℃壒绫诲瀷")
- @Dict(dicCode = "approved_rejected")
- private String approvalDealType;
- /**
* 鍊熷嚭鐘舵��
*/
- @Excel(name = "鍊熷嚭鐘舵��", width = 15)
@ApiModelProperty(value = "鍊熷嚭鐘舵��")
- @Dict(dicCode = "equipment_lean_out_status")
private String leanStatus;
/**
* 鍊熷嚭寮�濮嬫椂闂�
@@ -117,55 +108,103 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date leanEndTime;
/**
- * 瀹℃牳浜�
+ * 浣跨敤杞﹂棿瀹℃牳浜�
*/
- @Excel(name = "瀹℃牳浜�", width = 15)
- @ApiModelProperty(value = "瀹℃牳浜�")
- @Dict(dicCode = "sys_user, realname, username")
- private String approvalUser;
+ @ApiModelProperty(value = "浣跨敤杞﹂棿瀹℃牳浜�")
+ private String useApprovalUser;
/**
- * 瀹℃牳鎰忚
+ * 浣跨敤杞﹂棿瀹℃壒绫诲瀷
*/
- @Excel(name = "瀹℃牳鎰忚", width = 15)
- @ApiModelProperty(value = "瀹℃牳鎰忚")
- private String approvalComment;
+ @ApiModelProperty(value = "浣跨敤杞﹂棿瀹℃壒绫诲瀷")
+ private String useApprovalDealType;
/**
- * 瀹℃牳鏃堕棿
+ * 浣跨敤杞﹂棿瀹℃牳鎰忚
*/
- @ApiModelProperty(value = "瀹℃牳鏃堕棿")
+ @ApiModelProperty(value = "浣跨敤杞﹂棿瀹℃牳鎰忚")
+ private String useApprovalComment;
+ /**
+ * 浣跨敤杞﹂棿瀹℃牳鏃堕棿
+ */
+ @ApiModelProperty(value = "浣跨敤杞﹂棿瀹℃牳鏃堕棿")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date approvalTime;
+ private Date useApprovalTime;
+
/**
- * 纭浜�
+ * 鍊熺敤杞﹂棿瀹℃牳浜�
*/
- @Excel(name = "纭浜�", width = 15)
- @ApiModelProperty(value = "纭浜�")
- @Dict(dicCode = "sys_user, realname, username")
- private String confirmUser;
+ @ApiModelProperty(value = "鍊熺敤杞﹂棿瀹℃牳浜�")
+ private String leanOutApprovalUser;
+ /**
+ * 鍊熺敤杞﹂棿瀹℃壒绫诲瀷
+ */
+ @ApiModelProperty(value = "鍊熺敤杞﹂棿瀹℃壒绫诲瀷")
+ private String leanOutApprovalDealType;
+ /**
+ * 鍊熺敤杞﹂棿瀹℃牳鎰忚
+ */
+ @ApiModelProperty(value = "浣跨敤杞﹂棿瀹℃牳鎰忚")
+ private String leanOutApprovalComment;
+ /**
+ * 鍊熺敤杞﹂棿瀹℃牳鏃堕棿
+ */
+ @ApiModelProperty(value = "鍊熺敤杞﹂棿瀹℃牳鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date leanOutApprovalTime;
+
+ /**
+ * 浣跨敤杞﹂棿纭浜�
+ */
+ @ApiModelProperty(value = "浣跨敤杞﹂棿纭浜�")
+ private String useConfirmUser;
+ /**
+ * 浣跨敤杞﹂棿纭瀹℃壒绫诲瀷
+ */
+ @ApiModelProperty(value = "浣跨敤杞﹂棿纭瀹℃壒绫诲瀷")
+ private String useConfirmDealType;
/**
* 纭鎰忚
*/
- @Excel(name = "纭鎰忚", width = 15)
- @ApiModelProperty(value = "纭鎰忚")
- private String confirmComment;
+ @ApiModelProperty(value = "浣跨敤杞﹂棿纭鎰忚")
+ private String useConfirmComment;
/**
- * 纭鏃堕棿
+ * 浣跨敤杞﹂棿纭鏃堕棿
*/
- @ApiModelProperty(value = "纭鏃堕棿")
+ @ApiModelProperty(value = "浣跨敤杞﹂棿纭鏃堕棿")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date confirmTime;
+ private Date useConfirmTime;
+ /**
+ * 鍊熺敤杞﹂棿纭浜�
+ */
+ @ApiModelProperty(value = "鍊熺敤杞﹂棿纭浜�")
+ private String leanOutConfirmUser;
+ /**
+ * 鍊熺敤杞﹂棿纭瀹℃壒绫诲瀷
+ */
+ @ApiModelProperty(value = "鍊熺敤杞﹂棿纭瀹℃壒绫诲瀷")
+ private String leanOutConfirmDealType;
+ /**
+ * 鍊熺敤杞﹂棿纭鎰忚
+ */
+ @ApiModelProperty(value = "鍊熺敤杞﹂棿纭鎰忚")
+ private String leanOutConfirmComment;
+ /**
+ * 鍊熺敤杞﹂棿纭鏃堕棿
+ */
+ @ApiModelProperty(value = "鍊熺敤杞﹂棿纭鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date leanOutConfirmTime;
/**
* 澶囨敞
*/
- @Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
private String remark;
/**
* 澶囨敞
*/
- @Excel(name = "褰掕繕澶囨敞", width = 15)
@ApiModelProperty(value = "褰掕繕澶囨敞")
private String returnComment;
--
Gitblit v1.9.3